Merge branch 'development' of https://github.com/arendst/Sonoff-Tasmota into development

sonoff/language/bg-BG.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Разрешете JavaScript, за да използвате Tasmota"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Минимален фърмуеър - моля надградете го"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Минимален фърмуеър<br/>моля надградете го"
 #define D_WEBSERVER_ACTIVE_ON "Уеб сървърът е активен на"
 #define D_WITH_IP_ADDRESS "с IP адрес"
 #define D_WEBSERVER_STOPPED "Уеб сървърът е спрян"

sonoff/language/cs-CZ.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Pro používání prostředí Tasmota povolte JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNÍ - prosím zaktualizujte"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNÍ<br/>prosím zaktualizujte"
 #define D_WEBSERVER_ACTIVE_ON "Aktivní Web server"
 #define D_WITH_IP_ADDRESS "na IP adrese"
 #define D_WEBSERVER_STOPPED "Web server zastaven"

sonoff/language/de-DE.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "JavaScript aktivieren um Tasmota benutzen zu können"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMUM-Firmware - bitte upgraden"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMUM-Firmware<br/>bitte upgraden"
 #define D_WEBSERVER_ACTIVE_ON "Web-Server aktiv bei"
 #define D_WITH_IP_ADDRESS "mit IP-Adresse"
 #define D_WEBSERVER_STOPPED "Web-Server angehalten"

sonoff/language/el-GR.h

@@ -220,7 +220,7 @@
 
 // webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - παρακαλώ αναβαθμίστε"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>παρακαλώ αναβαθμίστε"
 #define D_WEBSERVER_ACTIVE_ON "Ενεργός διακομιστής Web στο"
 #define D_WITH_IP_ADDRESS "με διεύθυνση IP"
 #define D_WEBSERVER_STOPPED "Ο διακομιστής Web σταμάτησε"

sonoff/language/en-GB.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - please upgrade"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>please upgrade"
 #define D_WEBSERVER_ACTIVE_ON "Web server active on"
 #define D_WITH_IP_ADDRESS "with IP address"
 #define D_WEBSERVER_STOPPED "Web server stopped"

sonoff/language/es-AR.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Habilitar JavaScript para usar Tasmota"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MÍNIMO - actualice por favor"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MÍNIMO<br/>actualice por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor web activo en"
 #define D_WITH_IP_ADDRESS "con dirección IP"
 #define D_WEBSERVER_STOPPED "Servidor web detenido"

sonoff/language/fr-FR.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Pour utiliser Tasmota, veuillez activer JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMAL - merci de mettre à jour"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMAL<br/>merci de mettre à jour"
 #define D_WEBSERVER_ACTIVE_ON "Serveur web actif sur"
 #define D_WITH_IP_ADDRESS "avec l'adresse IP"
 #define D_WEBSERVER_STOPPED "Serveur web éteint"

sonoff/language/hu-HU.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "A Tasmota használatához engedélyezd a Javascriptet!"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMÁLIS firmware - frissítsd!"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMÁLIS firmware<br/>frissítsd!"
 #define D_WEBSERVER_ACTIVE_ON "Webszerver aktív:"
 #define D_WITH_IP_ADDRESS "IP cím:"
 #define D_WEBSERVER_STOPPED "Webszerver leállítva"

sonoff/language/it-IT.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Abilitare JavaScript per utilizzare Tasmota"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - effettuare aggiornamento"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>effettuare aggiornamento"
 #define D_WEBSERVER_ACTIVE_ON "Web server attivo su"
 #define D_WITH_IP_ADDRESS "con indirizzo IP"
 #define D_WEBSERVER_STOPPED "Web server arrestato"

sonoff/language/ko-KO.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Tasmota를 사용하려면 JavaScript를 활성화 하십시오."
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - 업그레이드가 필요합니다"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>업그레이드가 필요합니다"
 #define D_WEBSERVER_ACTIVE_ON "Web 서버 작동 중"
 #define D_WITH_IP_ADDRESS "IP 주소"
 #define D_WEBSERVER_STOPPED "Web 서버 멈춤"

sonoff/language/nl-NL.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Zet JavaScript aan voor Tasmota"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - opwaarderen"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>opwaarderen"
 #define D_WEBSERVER_ACTIVE_ON "Webserver actief op"
 #define D_WITH_IP_ADDRESS "met IP adres"
 #define D_WEBSERVER_STOPPED "Webserver gestopt"

sonoff/language/pl-PL.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Aby korzystać z Tasmota, włącz obsługę JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL - proszę uaktualnić"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Oprogramowanie MINIMAL<br/>proszę uaktualnić"
 #define D_WEBSERVER_ACTIVE_ON "Aktywny serwer Web"
 #define D_WITH_IP_ADDRESS "z adresem IP"
 #define D_WEBSERVER_STOPPED "Serwer Web zatrzymany"

sonoff/language/pt-BR.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware mínimo - Atualizar por favor"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware mínimo<br/>Atualizar por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em"
 #define D_WITH_IP_ADDRESS "com o endereço IP"
 #define D_WEBSERVER_STOPPED "Servidor WEB parou"

sonoff/language/pt-PT.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMO firmware - Atualizar Por favor"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMO firmware<br/>Atualizar Por favor"
 #define D_WEBSERVER_ACTIVE_ON "Servidor WEB ativo em"
 #define D_WITH_IP_ADDRESS "com o endereço IP"
 #define D_WEBSERVER_STOPPED "Servitor WEB parou"

sonoff/language/ru-RU.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL - пожалуйста обновите"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL<br/>пожалуйста обновите"
 #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активен"
 #define D_WITH_IP_ADDRESS "с IP-адресом"
 #define D_WEBSERVER_STOPPED "Веб-сервер остановлен"

sonoff/language/sk-SK.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "Pre používanie prostredia Tasmota povoľte JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNY - prosím aktualizujte"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Firmware MINIMÁLNY<br/>prosím aktualizujte"
 #define D_WEBSERVER_ACTIVE_ON "Aktívny Web server"
 #define D_WITH_IP_ADDRESS "na IP adrese"
 #define D_WEBSERVER_STOPPED "Web server zastavený"

sonoff/language/sv-SE.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "För att använda Tasmota, aktivera JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware - var god uppgradera"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "MINIMAL firmware<br/>var god uppgradera"
 #define D_WEBSERVER_ACTIVE_ON "Webbserver aktiv på"
 #define D_WITH_IP_ADDRESS "med IP-adress"
 #define D_WEBSERVER_STOPPED "Webbserver stoppad"

sonoff/language/tr-TR.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Donanım yazılımı çok düşük, lütfen yükseltin"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Donanım yazılımı çok düşük<br/>lütfen yükseltin"
 #define D_WEBSERVER_ACTIVE_ON "Web sunucusu aktif"
 #define D_WITH_IP_ADDRESS "IP adres ile"
 #define D_WEBSERVER_STOPPED "Web sunucusu durdu"

sonoff/language/uk-UK.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL - будь-ласка оновіть"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "Прошивка MINIMAL<br/>будь-ласка оновіть"
 #define D_WEBSERVER_ACTIVE_ON "Веб-сервер активний"
 #define D_WITH_IP_ADDRESS "з IP-адресом"
 #define D_WEBSERVER_STOPPED "Веб-сервер зупинений"

sonoff/language/zh-CN.h

@@ -220,7 +220,7 @@
 
 // webserver.ino
 #define D_NOSCRIPT "Tasmota要求浏览器支持 JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "当前是精简版固件 - 请升级"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "当前是精简版固件<br/>请升级"
 #define D_WEBSERVER_ACTIVE_ON "Web 服务器地址:"
 #define D_WITH_IP_ADDRESS "IP 地址:"
 #define D_WEBSERVER_STOPPED "Web 服务已停止"

sonoff/language/zh-TW.h

@@ -220,7 +220,7 @@
 
 // xdrv_02_webserver.ino
 #define D_NOSCRIPT "To use Tasmota, please enable JavaScript"
-#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "固件版本過低 - 請升級"
+#define D_MINIMAL_FIRMWARE_PLEASE_UPGRADE "固件版本過低<br/>請升級"
 #define D_WEBSERVER_ACTIVE_ON "Web服務器:"
 #define D_WITH_IP_ADDRESS "IP地址:"
 #define D_WEBSERVER_STOPPED "Web 服務器已停止"

sonoff/sonoff.ino

@@ -167,7 +167,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 reset_web_log_flag = false;            // Reset web console log
 myio my_module;                             // Active copy of Module GPIOs (17 x 8 bits)
 gpio_flag my_module_flag;                   // Active copy of Module GPIO flags
 StateBitfield global_state;                 // Global states (currently Wifi and Mqtt) (8 bits)

sonoff/sonoff_template.h

@@ -1472,10 +1472,10 @@ const mytmplt kModules[MAXMODULE] PROGMEM = {
      0, 0
   },
   { "Shelly 1",        // Shelly1 Open Source (ESP8266 - 2MB) - https://shelly.cloud/shelly1-open-source/
-     GPIO_USER,        // GPIO00 - Only to be used when Shelly is connected to 12V DC
+     0,                // GPIO00 - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
-     GPIO_USER,        // GPIO01 Serial RXD - Only to be used when Shelly is connected to 12V DC
+     0,                // GPIO01 Serial RXD - Can be changed to GPIO_USER, only if Shelly is powered with 12V DC
      0,
-     GPIO_USER,        // GPIO03 Serial TXD - Only to be used when Shelly is connected to 12V DC
+     0,                // 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)

sonoff/xdrv_01_webserver.ino

@@ -383,7 +383,7 @@ const char HTTP_END[] PROGMEM =
   "</html>";
 
 const char HTTP_DEVICE_CONTROL[] PROGMEM = "<td style='width:%d%%'><button onclick='la(\"&o=%d\");'>%s%s</button></td>";  // ?o is related to WebGetArg("o", tmp, sizeof(tmp));
-const char HTTP_DEVICE_STATE[] PROGMEM = "%s<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";  // {c} = %'><div style='text-align:center;font-weight:
+const char HTTP_DEVICE_STATE[] PROGMEM = "<td style='width:%d{c}%s;font-size:%dpx'>%s</div></td>";  // {c} = %'><div style='text-align:center;font-weight:
 
 enum ButtonTitle {
   BUTTON_RESTART, BUTTON_RESET_CONFIGURATION,
@@ -423,6 +423,7 @@ ESP8266WebServer *WebServer;
 String chunk_buffer = "";                         // Could be max 2 * CHUNKED_BUFFER_SIZE
 int minimum_signal_quality = -1;
 bool remove_duplicate_access_points = true;
+bool reset_web_log_flag = false;                  // Reset web console log
 uint8_t webserver_state = HTTP_OFF;
 uint8_t upload_error = 0;
 uint8_t upload_file_type;
@@ -588,6 +589,19 @@ void WSSend(int code, int ctype, const String& content)
 * HTTP Content Chunk handler
 **********************************************************************************************/
 
+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, "");                        // Signal start of chunked content
+  chunk_buffer = "";
+}
+
 void _WSContentSend(const String& content)        // Low level sendContent for all core versions
 {
   size_t len = content.length();
@@ -648,19 +662,13 @@ void WSContentStart_P(const char* title, bool auth)
     return WebServer->requestAuthentication();
   }
 
-  WebServer->client().flush();
+  WSContentBegin(200, CT_HTML);
-  WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
-  WSHeaderSend();
-#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
-  WebServer->sendHeader(F("Accept-Ranges"),F("none"));
-  WebServer->sendHeader(F("Transfer-Encoding"),F("chunked"));
-#endif
-  WSSend(200, CT_HTML, "");                        // Signal start of chunked content
-  chunk_buffer = "";
 
-  char ctitle[strlen_P(title) +1];
+  if (title != NULL) {
-  strcpy_P(ctitle, title);                         // Get title from flash to RAM
+    char ctitle[strlen_P(title) +1];
-  WSContentSend_P(HTTP_HEAD, Settings.friendlyname[0], ctitle);
+    strcpy_P(ctitle, title);                       // Get title from flash to RAM
+    WSContentSend_P(HTTP_HEAD, Settings.friendlyname[0], ctitle);
+  }
 }
 
 void WSContentStart_P(const char* title)
@@ -677,16 +685,18 @@ void WSContentSendStyle_P(const char* style)
   }
   WSContentSend_P(HTTP_HEAD_STYLE1);
   WSContentSend_P(HTTP_HEAD_STYLE2);
-  WSContentSend_P(style);
+  if (style != NULL) {
+    WSContentSend_P(style);
+  }
   WSContentSend_P(HTTP_HEAD_STYLE3, ModuleName().c_str(), Settings.friendlyname[0]);
   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>"),    // sonoff.local (192.168.2.12,192.168.4.1)
+    WSContentSend_P(PSTR("<h4>%s%s (%s%s%s)</h4>"),    // sonoff.local (192.168.2.12, 192.168.4.1)
       my_hostname,
       (mdns_begun) ? ".local" : "",
       (lip) ? WiFi.localIP().toString().c_str() : "",
-      (lip && sip) ? "," : "",
+      (lip && sip) ? ", " : "",
       (sip) ? WiFi.softAPIP().toString().c_str() : "");
   }
   WSContentSend_P(PSTR("</div>"));
@@ -694,7 +704,7 @@ void WSContentSendStyle_P(const char* style)
 
 void WSContentSendStyle(void)
 {
-  WSContentSendStyle_P(PSTR(""));
+  WSContentSendStyle_P(NULL);
 }
 
 void WSContentButton(uint8_t title_index)
@@ -723,6 +733,13 @@ void WSContentSpaceButton(uint8_t title_index)
 }
 
 void WSContentEnd(void)
+{
+  WSContentFlush();                                // Flush chunk buffer
+  _WSContentSend("");                              // Signal end of chunked content
+  WebServer->client().stop();
+}
+
+void WSContentStop(void)
 {
   if (WifiIsInManagerMode()) {
     if (WifiConfigCounter()) {
@@ -730,9 +747,7 @@ void WSContentEnd(void)
     }
   }
   WSContentSend_P(HTTP_END, my_version);
-  WSContentFlush();                                // Flush chunk buffer
+  WSContentEnd();
-  _WSContentSend("");                              // Signal end of chunked content
-  WebServer->client().stop();
 }
 
 /*********************************************************************************************/
@@ -762,7 +777,7 @@ void WebRestart(uint8_t type)
   } else {
     WSContentSpaceButton(BUTTON_MAIN);
   }
-  WSContentEnd();
+  WSContentStop();
 
   ShowWebSource(SRC_WEBGUI);
   restart_flag = 2;
@@ -783,7 +798,7 @@ void HandleWifiLogin(void)
 #endif  // FIRMWARE_MINIMAL
   }
 
-  WSContentEnd();
+  WSContentStop();
 }
 
 void HandleRoot(void)
@@ -877,7 +892,7 @@ void HandleRoot(void)
     WSContentButton(BUTTON_CONSOLE);
     WSContentButton(BUTTON_RESTART);
   }
-  WSContentEnd();
+  WSContentStop();
 }
 
 bool HandleRootStatusRefresh(void)
@@ -925,7 +940,7 @@ bool HandleRootStatusRefresh(void)
     ExecuteWebCommand(svalue, SRC_WEBGUI);
   }
 
-  snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{t}"));
+  mqtt_data[0] = '\0';
   XsnsCall(FUNC_WEB_APPEND);
   if (D_DECIMAL_SEPARATOR[0] != '.') {
     for (uint16_t i = 0; i < strlen(mqtt_data); i++) {
@@ -934,28 +949,29 @@ bool HandleRootStatusRefresh(void)
       }
     }
   }
-  snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s</table>"), mqtt_data);
+  char stemp[strlen(mqtt_data) +1];
+  memcpy(stemp, mqtt_data, sizeof(stemp));
+
+  WSContentBegin(200, CT_HTML);
+  WSContentSend_P(PSTR("{t}%s</table>"), stemp);
   if (devices_present) {
-    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s{t}<tr>"), mqtt_data);
+    WSContentSend_P(PSTR("{t}<tr>"));
     uint8_t fsize = (devices_present < 5) ? 70 - (devices_present * 8) : 32;
     if (SONOFF_IFAN02 == my_module_type) {
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_STATE,
+      WSContentSend_P(HTTP_DEVICE_STATE, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
-        mqtt_data, 36, (bitRead(power, 0)) ? "bold" : "normal", 54, GetStateText(bitRead(power, 0)));
       uint8_t fanspeed = GetFanspeed();
       snprintf_P(svalue, sizeof(svalue), PSTR("%d"), fanspeed);
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_STATE,
+      WSContentSend_P(HTTP_DEVICE_STATE, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
-        mqtt_data, 64, (fanspeed) ? "bold" : "normal", 54, (fanspeed) ? svalue : GetStateText(0));
     } else {
       for (uint8_t idx = 1; idx <= devices_present; idx++) {
         snprintf_P(svalue, sizeof(svalue), PSTR("%d"), bitRead(power, idx -1));
-        snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_DEVICE_STATE,
+        WSContentSend_P(HTTP_DEVICE_STATE, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
-          mqtt_data, 100 / devices_present, (bitRead(power, idx -1)) ? "bold" : "normal", fsize, (devices_present < 5) ? GetStateText(bitRead(power, idx -1)) : svalue);
       }
     }
-    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s</tr></table>"), mqtt_data);
+    WSContentSend_P(PSTR("</tr></table>"));
   }
-  WSHeaderSend();
+  WSContentEnd();
-  WSSend(200, CT_HTML, mqtt_data);
+
   return true;
 }
 
@@ -987,7 +1003,7 @@ void HandleConfiguration(void)
   WSContentButton(BUTTON_RESTORE);
 
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 }
 
 /*-------------------------------------------------------------------------------------------*/
@@ -1005,13 +1021,12 @@ void HandleTemplateConfiguration(void)
   char stemp[20];                                           // Template number and Sensor name
 
   if (WebServer->hasArg("m")) {
-    String page = "";
+    WSContentBegin(200, CT_PLAIN);
     for (uint8_t i = 0; i < MAXMODULE; i++) {               // "}2'%d'>%s (%d)}3" - "}2'0'>Sonoff Basic (1)}3"
       uint8_t midx = pgm_read_byte(kModuleNiceList + i);
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), midx +1);
-      page += mqtt_data;
     }
-    WSSend(200, CT_PLAIN, page);
+    WSContentEnd();
     return;
   }
 
@@ -1025,32 +1040,26 @@ void HandleTemplateConfiguration(void)
     gpio_flag flag = ModuleFlag();
     Settings.module = module_save;
 
-    String page = AnyModuleName(module);                    // NAME: Generic
+    WSContentBegin(200, CT_PLAIN);
-    page += F("}1");                                        // Field separator
+    WSContentSend_P(PSTR("%s}1"), AnyModuleName(module).c_str());  // NAME: Generic
-
     for (uint8_t i = 0; i < sizeof(kGpioNiceList); i++) {   // GPIO: }2'0'>None (0)}3}2'17'>Button1 (17)}3...
 
       if (1 == i) {
-        snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);  // }2'255'>User (255)}3
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, 255, D_SENSOR_USER, 255);  // }2'255'>User (255)}3
-        page += mqtt_data;
       }
 
       uint8_t midx = pgm_read_byte(kGpioNiceList + i);
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-      page += mqtt_data;
     }
 
-    page += F("}1");                                        // Field separator
+    WSContentSend_P(PSTR("}1"));                                   // Field separator
-    mqtt_data[0] = '\0';
     for (uint8_t i = 0; i < sizeof(cmodule); i++) {         // 17,148,29,149,7,255,255,255,138,255,139,255,255
       if ((i < 6) || ((i > 8) && (i != 11))) {              // Ignore flash pins GPIO06, 7, 8 and 11
-        snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s%s%d"), mqtt_data, (i>0)?",":"", cmodule.io[i]);
+        WSContentSend_P(PSTR("%s%d"), (i>0)?",":"", cmodule.io[i]);
       }
     }
-    snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s}1%d}1%d"), mqtt_data, flag, Settings.user_template_base);  // FLAG: 1  BASE: 17
+    WSContentSend_P(PSTR("}1%d}1%d"), flag, Settings.user_template_base);  // FLAG: 1  BASE: 17
-    page += mqtt_data;
+    WSContentEnd();
-
-    WSSend(200, CT_PLAIN, page);
     return;
   }
 
@@ -1078,7 +1087,7 @@ void HandleTemplateConfiguration(void)
   WSContentSend_P(HTTP_FORM_TEMPLATE_FLAG);
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void TemplateSaveSettings(void)
@@ -1132,7 +1141,7 @@ void HandleModuleConfiguration(void)
   ModuleGpios(&cmodule);
 
   if (WebServer->hasArg("m")) {
-    String page = "";
+    WSContentBegin(200, CT_PLAIN);
     uint8_t vidx = 0;
     for (uint8_t i = 0; i <= MAXMODULE; i++) {  // "}2'%d'>%s (%d)}3" - "}2'255'>UserTemplate (0)}3" - "}2'0'>Sonoff Basic (1)}3"
       if (0 == i) {
@@ -1142,23 +1151,21 @@ void HandleModuleConfiguration(void)
         midx = pgm_read_byte(kModuleNiceList + i -1);
         vidx = midx +1;
       }
-      snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
+      WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, AnyModuleName(midx).c_str(), vidx);
-      page += mqtt_data;
     }
-    WSSend(200, CT_PLAIN, page);
+    WSContentEnd();
     return;
   }
 
   if (WebServer->hasArg("g")) {
-    String page = "";
+    WSContentBegin(200, CT_PLAIN);
     for (uint8_t j = 0; j < sizeof(kGpioNiceList); j++) {
       midx = pgm_read_byte(kGpioNiceList + j);
       if (!GetUsedInModule(midx, cmodule.io)) {
-        snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
+        WSContentSend_P(HTTP_MODULE_TEMPLATE_REPLACE, midx, GetTextIndexed(stemp, sizeof(stemp), midx, kSensorNames), midx);
-        page += mqtt_data;
       }
     }
-    WSSend(200, CT_PLAIN, page);
+    WSContentEnd();
     return;
   }
 
@@ -1185,7 +1192,7 @@ void HandleModuleConfiguration(void)
   WSContentSend_P(PSTR("</table>"));
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void ModuleSaveSettings(void)
@@ -1327,7 +1334,7 @@ void HandleWifiConfiguration(void)
   } else {
     WSContentSpaceButton(BUTTON_CONFIGURATION);
   }
-  WSContentEnd();
+  WSContentStop();
 }
 
 void WifiSaveSettings(void)
@@ -1386,7 +1393,7 @@ void HandleLoggingConfiguration(void)
   WSContentSend_P(HTTP_FORM_LOG2, Settings.syslog_host, Settings.syslog_port, Settings.tele_period);
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void LoggingSaveSettings(void)
@@ -1462,7 +1469,7 @@ void HandleOtherConfiguration(void)
 
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void OtherSaveSettings(void)
@@ -1558,7 +1565,7 @@ void HandleResetConfiguration(void)
   WSContentSend_P(PSTR("<div style='text-align:center;'>" D_CONFIGURATION_RESET "</div>"));
   WSContentSend_P(HTTP_MSG_RSTRT);
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 
   char command[CMDSZ];
   snprintf_P(command, sizeof(command), PSTR(D_CMND_RESET " 1"));
@@ -1576,7 +1583,7 @@ void HandleRestoreConfiguration(void)
   WSContentSend_P(HTTP_FORM_RST);
   WSContentSend_P(HTTP_FORM_RST_UPG, D_RESTORE);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 
   upload_error = 0;
   upload_file_type = UPL_SETTINGS;
@@ -1678,7 +1685,7 @@ void HandleInformation(void)
                        "<div id='i' name='i'></div>"));
   //   WSContentSend_P(PSTR("</fieldset>"));
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 }
 #endif  // Not FIRMWARE_MINIMAL
 
@@ -1695,7 +1702,7 @@ void HandleUpgradeFirmware(void)
   WSContentSend_P(HTTP_FORM_UPG, Settings.ota_url);
   WSContentSend_P(HTTP_FORM_RST_UPG, D_UPGRADE);
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 
   upload_error = 0;
   upload_file_type = UPL_TASMOTA;
@@ -1723,7 +1730,7 @@ void HandleUpgradeFirmwareStart(void)
   WSContentSend_P(PSTR("<div style='text-align:center;'><b>" D_UPGRADE_STARTED " ...</b></div>"));
   WSContentSend_P(HTTP_MSG_RSTRT);
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 
   snprintf_P(command, sizeof(command), PSTR(D_CMND_UPGRADE " 1"));
   ExecuteWebCommand(command, SRC_WEBGUI);
@@ -1770,7 +1777,7 @@ void HandleUploadDone(void)
   SettingsBufferFree();
   WSContentSend_P(PSTR("</div><br/>"));
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void HandleUploadLoop(void)
@@ -1990,7 +1997,7 @@ void HandleHttpCommand(void)
     if (!(!strcmp(tmp1, WEB_USERNAME) && !strcmp(tmp2, Settings.web_password))) { valid = 0; }
   }
 
-  String message = F("{\"" D_RSLT_WARNING "\":\"");
+  WSContentBegin(200, CT_JSON);
   if (valid) {
     uint8_t curridx = web_log_index;
     String svalue = WebServer->arg("cmnd");
@@ -1998,7 +2005,8 @@ void HandleHttpCommand(void)
       ExecuteWebCommand((char*)svalue.c_str(), SRC_WEBCOMMAND);
       if (web_log_index != curridx) {
         uint8_t counter = curridx;
-        message = F("{");
+        WSContentSend_P(PSTR("{"));
+        bool cflg = false;
         do {
           char* tmp;
           size_t len;
@@ -2007,28 +2015,28 @@ void HandleHttpCommand(void)
             // [14:49:36 MQTT: stat/wemos5/RESULT = {"POWER":"OFF"}] > [{"POWER":"OFF"}]
             char* JSON = (char*)memchr(tmp, '{', len);
             if (JSON) { // Is it a JSON message (and not only [15:26:08 MQT: stat/wemos5/POWER = O])
-              if (message.length() > 1) { message += F(","); }
               size_t JSONlen = len - (JSON - tmp);
               if (JSONlen > sizeof(mqtt_data)) { JSONlen = sizeof(mqtt_data); }
-              strlcpy(mqtt_data, JSON +1, JSONlen -2);
+              char stemp[JSONlen];
-              message += mqtt_data;
+              strlcpy(stemp, JSON +1, JSONlen -2);
+              WSContentSend_P(PSTR("%s%s"), (cflg) ? "," : "", stemp);
+              cflg = true;
             }
           }
           counter++;
           if (!counter) counter++;  // Skip 0 as it is not allowed
         } while (counter != web_log_index);
-        message += F("}");
+        WSContentSend_P(PSTR("}"));
       } else {
-        message += F(D_ENABLE_WEBLOG_FOR_RESPONSE "\"}");
+        WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENABLE_WEBLOG_FOR_RESPONSE "\"}"));
       }
     } else {
-      message += F(D_ENTER_COMMAND " cmnd=\"}");
+      WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_ENTER_COMMAND " cmnd=\"}"));
     }
   } else {
-    message += F(D_NEED_USER_AND_PASSWORD "\"}");
+    WSContentSend_P(PSTR("{\"" D_RSLT_WARNING "\":\"" D_NEED_USER_AND_PASSWORD "\"}"));
   }
-  WSHeaderSend();
+  WSContentEnd();
-  WSSend(200, CT_JSON, message);
 }
 
 /*-------------------------------------------------------------------------------------------*/
@@ -2049,7 +2057,7 @@ void HandleConsole(void)
   WSContentSendStyle();
   WSContentSend_P(HTTP_FORM_CMND);
   WSContentSpaceButton(BUTTON_MAIN);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void HandleConsoleRefresh(void)
@@ -2067,10 +2075,8 @@ void HandleConsoleRefresh(void)
   WebGetArg("c2", stmp, sizeof(stmp));
   if (strlen(stmp)) { counter = atoi(stmp); }
 
-  bool last_reset_web_log_flag = reset_web_log_flag;
+  WSContentBegin(200, CT_PLAIN);
-  // mqtt_data used as scratch space
+  WSContentSend_P(PSTR("%d}1%d}1"), web_log_index, reset_web_log_flag);
-  snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%d}1%d}1"), web_log_index, last_reset_web_log_flag);
-  String message = mqtt_data;
   if (!reset_web_log_flag) {
     counter = 0;
     reset_web_log_flag = true;
@@ -2085,21 +2091,18 @@ void HandleConsoleRefresh(void)
       size_t len;
       GetLog(counter, &tmp, &len);
       if (len) {
-        if (cflg) {
-          message += F("\n");
-        } else {
-          cflg = true;
-        }
         if (len > sizeof(mqtt_data) -2) { len = sizeof(mqtt_data); }
-        strlcpy(mqtt_data, tmp, len);
+        char stemp[len +1];
-        message += mqtt_data; // mqtt_data used as scratch space
+        strlcpy(stemp, tmp, len);
+        WSContentSend_P(PSTR("%s%s"), (cflg) ? "\n" : "", stemp);
+        cflg = true;
       }
       counter++;
-      if (!counter) { counter++; } // Skip log index 0 as it is not allowed
+      if (!counter) { counter++; }  // Skip log index 0 as it is not allowed
     } while (counter != web_log_index);
   }
-  message += F("}1");
+  WSContentSend_P(PSTR("}1"));
-  WSSend(200, CT_PLAIN, message);
+  WSContentEnd();
 }
 
 /********************************************************************************************/

sonoff/xdrv_02_mqtt.ino

@@ -18,7 +18,6 @@
 */
 
 #define XDRV_02                2
-/*********************************************************************************************/
 
 #ifdef USE_MQTT_TLS
 #ifdef USE_MQTT_TLS_CA_CERT
@@ -441,13 +440,11 @@ void MqttReconnect(void)
   GetTopic_P(stopic, TELE, mqtt_topic, S_LWT);
   snprintf_P(mqtt_data, sizeof(mqtt_data), S_OFFLINE);
 
-//#ifdef ARDUINO_ESP8266_RELEASE_2_4_1
 #ifdef USE_MQTT_TLS
   EspClient = WiFiClientSecure();         // Wifi Secure Client reconnect issue 4497 (https://github.com/esp8266/Arduino/issues/4497)
 #else
   EspClient = WiFiClient();               // Wifi Client reconnect issue 4497 (https://github.com/esp8266/Arduino/issues/4497)
 #endif
-//#endif
 
   if (2 == mqtt_initial_connection_state) {  // Executed once just after power on and wifi is connected
 #ifdef USE_MQTT_TLS
@@ -777,7 +774,7 @@ void HandleMqttConfiguration(void)
     Settings.mqtt_fulltopic);
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void MqttSaveSettings(void)

sonoff/xdrv_07_domoticz.ino

@@ -482,7 +482,7 @@ void HandleDomoticzConfiguration(void)
   WSContentSend_P(PSTR("</table>"));
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void DomoticzSaveSettings(void)

sonoff/xdrv_09_timers.ino

@@ -721,7 +721,7 @@ void HandleTimerConfiguration(void)
   WSContentSend_P(HTTP_FORM_TIMER4);
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void TimerSaveSettings(void)

sonoff/xdrv_11_knx.ino

@@ -934,7 +934,7 @@ void HandleKNXConfiguration(void)
     WSContentSend_P(PSTR("</table></center></fieldset>"));
     WSContentSend_P(HTTP_FORM_END);
     WSContentSpaceButton(BUTTON_CONFIGURATION);
-    WSContentEnd();
+    WSContentStop();
   }
 
 }

sonoff/xsns_34_hx711.ino

@@ -434,7 +434,7 @@ void HandleHxAction(void)
   WSContentSend_P(HTTP_FORM_HX711, stemp1, stemp2);
   WSContentSend_P(HTTP_FORM_END);
   WSContentSpaceButton(BUTTON_CONFIGURATION);
-  WSContentEnd();
+  WSContentStop();
 }
 
 void HxSaveSettings(void)