Merge branch 'development' into pre-release-9.5.0

CHANGELOG.md

@@ -6,7 +6,11 @@ All notable changes to this project will be documented in this file.
 ## [9.5.0] 20210617
 - Release Michael (Rossi)
 
-## [9.4.0.5] 20210617
+## [9.4.0.6] 20210617
+### Added
+- Command ``MqttWifiTimeout 100..20000`` to control MQTT Wi-Fi connection timeout default set to 200 mS (#12222)
+
+## [9.4.0.5] 20210615
 ### Added
 - Preliminary support for Esp32C3 - RiscV based
 
@@ -19,7 +23,7 @@ All notable changes to this project will be documented in this file.
 - I2C extended MPU6886 to also support MPU9250 (found in Legacy M5Stack Fire)
 - ESP32 increase log buffer from 4k to 6k to support longer messages
 - Move Settings from DRAM to heap
-- WifiManager save wificonfig from settings, do it only once (#12242)
+- WifiManager save Wi-Fi configuration from settings, do it only once (#12242)
 - Improving SI7021 reading reliability by adjusting timers (#12256)
 - Refactor ESP32 partition selection, now via boards (#12257)
 - Refactor platformio configurations by Jason2866
@@ -94,7 +98,7 @@ All notable changes to this project will be documented in this file.
 
 ## [9.4.0.1] 20210423
 ### Added
-- Command ``Wifi 0/1`` for ESP8266 to turn wifi Off and On. When wifi is Off it is always returned On after a restart except for a wake-up from deepsleep (#11839)
+- Command ``Wifi 0/1`` for ESP8266 to turn Wi-Fi Off and On. When Wi-Fi is Off it is always returned On after a restart except for a wake-up from deepsleep (#11839)
 
 ### Changed
 - Zigbee refactored storage for device configuration and device last known data (#11838)
@@ -120,7 +124,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - In tasmota-sensors.bin enabled support for VL53L0X and disabled TSL2561 (#11711)
 - Add HLW8012/BL0937 average pulse calculation by Alex Lovett (#11722)
-- Redesigned initial GUI wifi configuration by Adrian Scillato (#11693)
+- Redesigned initial GUI Wi-Fi configuration by Adrian Scillato (#11693)
 - Redesigned GUI by moving non-configuration buttons from ``Configuration`` to new submenu ``Consoles``
 
 ### Fixed
@@ -289,8 +293,8 @@ All notable changes to this project will be documented in this file.
 - ESP8266 until now NOT SUPPORTED linker files 2MB and up. Current settings will be overwritten once LittleFS is enabled
 
 ### Changed
-- Force initial default state ``SetOption57 1`` to scan wifi network every 44 minutes for strongest signal (#10395)
-- Command ``Sleep 0`` removes any sleep from wifi modem except when ESP32 BLE is active
+- Force initial default state ``SetOption57 1`` to scan Wi-Fi network every 44 minutes for strongest signal (#10395)
+- Command ``Sleep 0`` removes any sleep from Wi-Fi modem except when ESP32 BLE is active
 - PubSubClient MQTT_SOCKET_TIMEOUT from 15 to 4 seconds
 - Domoticz fixed 2 decimals resolution by user selectable ``TempRes``, ``HumRes`` and ``PressRes`` resolutions
 
@@ -329,7 +333,7 @@ All notable changes to this project will be documented in this file.
 - Gpio ``Option A1`` enabling PWM2 high impedance if powered off as used by Wyze bulbs (#10196)
 - Support for FTC532 8-button touch controller by Peter Franck (#10222)
 - Support character `#` to be replaced by `space`-character in command ``Publish`` topic (#10258)
-- BSSID and Signal Strength Indicator to GUI wifi scan result (#10253)
+- BSSID and Signal Strength Indicator to GUI Wi-Fi scan result (#10253)
 - Support for Afrikaans language translations by Christiaan Heerze
 - Support for IR inverted leds using ``#define IR_SEND_INVERTED true`` (#10301)
 - Support for disabling 38kHz IR modulation using ``#define IR_SEND_USE_MODULATION false`` (#10301)
@@ -385,7 +389,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Core library from v2.7.4.7 to v2.7.4.9
 - Shelly Dimmer fw upgrade using WebGUI Firmware Upgrade and file from folder `tools/fw_shd_stm32/`
-- MQTT Wifi connection timeout from 5000 to 200 mSec (#9886)
+- MQTT Wi-Fi connection timeout from 5000 to 200 mSec (#9886)
 - Platformio compiler option `-free -fipa-pta` enabled (#9875)
 - IRremoteESP8266 library from v2.7.12 to v2.7.13
 - Shelly Dimmer 1 and 2 stm32 firmware from v51.4 to v51.5
@@ -689,7 +693,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Initial support for Telegram bot (#8619)
 - Support for HP303B Temperature and Pressure sensor by Robert Jaakke (#8638)
-- Rule trigger ``System#Init`` to allow early rule execution without wifi and mqtt initialized yet
+- Rule trigger ``System#Init`` to allow early rule execution without Wi-Fi and mqtt initialized yet
 - Serial to TCP bridge, ``TCPStart`` and ``TCPBaudRate`` (needs #define USE_TCP_BRIDGE)
 
 ## [8.3.1.2] - 20200522
@@ -804,7 +808,7 @@ All notable changes to this project will be documented in this file.
 - Command ``Ping`` (#7176)
 - Command ``Palette`` to add the ability to specify a palette of colors (#8150)
 - Commands ``GlobalTemp`` and ``GlobalHum`` to init sensor data (#8152)
-- Quick wifi reconnect using saved AP parameters when ``SetOption56 0`` (#3189)
+- Quick Wi-Fi reconnect using saved AP parameters when ``SetOption56 0`` (#3189)
 - More accuracy to GPS NTP server (#8088)
 - Support for an iAQ sensor (#8107)
 - Support for Seven Segment display using HT16K33 (#8116)
@@ -818,7 +822,7 @@ All notable changes to this project will be documented in this file.
 - IRremoteESP8266 library updated to v2.7.5
 
 ### Fixed
-- PWM flickering during wifi connection (#8046)
+- PWM flickering during Wi-Fi connection (#8046)
 - Zigbee crash with Occupancy sensor (#8089)
 - Prevent multiple pings to run concurrently
 - Scheme 2-4 brightness when SetOption68 1 (#8058)

MODULES.md

@@ -5,80 +5,80 @@ The following ESP8266 based hardware modules are supported.
 
 Module             | LCode | Description
 -------------------|-------|-----------------------
-01 Sonoff Basic    |       | Sonoff Basic Wifi Smart Switch
-02 Sonoff RF       |       | Sonoff RF Wifi Smart Switch with RF (434MHz) receiver
-03 Sonoff SV       |       | Sonoff SV Safe Voltage Wifi Smart Switch
-04 Sonoff TH       |       | Sonoff TH10/TH16 Wifi Smart Switch with Sensor connection
-05 Sonoff Dual     |   x   | Sonoff Dual Wifi Smart Switch
-06 Sonoff Pow      |       | Sonoff Pow Wifi Smart Switch with Energy Monitoring
-07 Sonoff 4CH      |       | Sonoff 4CH 4-gang Wifi Smart Switch
-08 Sonoff S2X      |       | Sonoff S20/S26 Wifi Smart Socket
-09 Slampher        |       | Sonoff Slampher Wifi Smart Light Bulb Socket with RF (434MHz) receiver
-10 Sonoff Touch    |   x   | Sonoff Touch Wifi Light Switch
-11 Sonoff LED      |   x   | Sonoff Led Wifi Led Pack (Retired)
-12 1 Channel       |       | 1 Channel Inching/Self Locking Wifi Switch 5V/12V
-13 4 Channel       |   x   | 4 Channel Inching/Self Locking Wifi Switch (Retired)
-14 Motor C/AC      |   x   | Motor Clockwise/Antoclockwise Wifi Switch (Retired)
-15 ElectroDragon   |       | Electrodragon Wifi IoT Board
-16 EXS Relay(s)    |   x   | Electronic Experience Store 1 or 2-gang Wifi Module
-17 WiOn            |       | WiOn Wifi Smart Socket
+01 Sonoff Basic    |       | Sonoff Basic Wi-Fi Smart Switch
+02 Sonoff RF       |       | Sonoff RF Wi-Fi Smart Switch with RF (434MHz) receiver
+03 Sonoff SV       |       | Sonoff SV Safe Voltage Wi-Fi Smart Switch
+04 Sonoff TH       |       | Sonoff TH10/TH16 Wi-Fi Smart Switch with Sensor connection
+05 Sonoff Dual     |   x   | Sonoff Dual Wi-Fi Smart Switch
+06 Sonoff Pow      |       | Sonoff Pow Wi-Fi Smart Switch with Energy Monitoring
+07 Sonoff 4CH      |       | Sonoff 4CH 4-gang Wi-Fi Smart Switch
+08 Sonoff S2X      |       | Sonoff S20/S26 Wi-Fi Smart Socket
+09 Slampher        |       | Sonoff Slampher Wi-Fi Smart Light Bulb Socket with RF (434MHz) receiver
+10 Sonoff Touch    |   x   | Sonoff Touch Wi-Fi Light Switch
+11 Sonoff LED      |   x   | Sonoff Led Wi-Fi Led Pack (Retired)
+12 1 Channel       |       | 1 Channel Inching/Self Locking Wi-Fi Switch 5V/12V
+13 4 Channel       |   x   | 4 Channel Inching/Self Locking Wi-Fi Switch (Retired)
+14 Motor C/AC      |   x   | Motor Clockwise/Antoclockwise Wi-Fi Switch (Retired)
+15 ElectroDragon   |       | Electrodragon Wi-Fi IoT Board
+16 EXS Relay(s)    |   x   | Electronic Experience Store 1 or 2-gang Wi-Fi Module
+17 WiOn            |       | WiOn Wi-Fi Smart Socket
 18 Generic         |   x   | Any ESP8266/ESP8285 device like WeMos and NodeMCU
-19 Sonoff Dev      |       | Sonoff Dev Wifi Development Board
-20 H801            |   x   | H801 Wifi 5 Channel LED Controller
-21 Sonoff SC       |   x   | Sonoff SC Wifi Environmental Monitor
-22 Sonoff BN-SZ    |   x   | Sonoff BN-SZ01 Wifi Ceiling Led (Retired)
-23 Sonoff 4CH Pro  |   x   | Sonoff 4CH Pro 4-gang Wifi Smart Switch
-24 Huafan SS       |       | HuaFan Wifi Smart Socket
-25 Sonoff Bridge   |   x   | Sonoff RF (434MHz) transceive to Wifi Bridge
-26 Sonoff B1       |   x   | Sonoff B1 Wifi RGBWW Led Bulb
+19 Sonoff Dev      |       | Sonoff Dev Wi-Fi Development Board
+20 H801            |   x   | H801 Wi-Fi 5 Channel LED Controller
+21 Sonoff SC       |   x   | Sonoff SC Wi-Fi Environmental Monitor
+22 Sonoff BN-SZ    |   x   | Sonoff BN-SZ01 Wi-Fi Ceiling Led (Retired)
+23 Sonoff 4CH Pro  |   x   | Sonoff 4CH Pro 4-gang Wi-Fi Smart Switch
+24 Huafan SS       |       | HuaFan Wi-Fi Smart Socket
+25 Sonoff Bridge   |   x   | Sonoff RF (434MHz) transceive to Wi-Fi Bridge
+26 Sonoff B1       |   x   | Sonoff B1 Wi-Fi RGBWW Led Bulb
 27 AiLight         |   x   | Ai-Thinker RGBW Led Bulb
-28 Sonoff T1 1CH   |   x   | Sonoff T1 1-gang Wifi Light Switch
-29 Sonoff T1 2CH   |   x   | Sonoff T1 2-gang Wifi Light Switch
-30 Sonoff T1 3CH   |   x   | Sonoff T1 3-gang Wifi Light Switch
-31 Supla Espablo   |       | 2-gang Wifi Module
-32 Witty Cloud     |       | Witty Cloud ESP8266 Wifi Development Board
-33 Yunshan Relay   |       | ESP8266 Wifi Network Relay Module
+28 Sonoff T1 1CH   |   x   | Sonoff T1 1-gang Wi-Fi Light Switch
+29 Sonoff T1 2CH   |   x   | Sonoff T1 2-gang Wi-Fi Light Switch
+30 Sonoff T1 3CH   |   x   | Sonoff T1 3-gang Wi-Fi Light Switch
+31 Supla Espablo   |       | 2-gang Wi-Fi Module
+32 Witty Cloud     |       | Witty Cloud ESP8266 Wi-Fi Development Board
+33 Yunshan Relay   |       | ESP8266 Wi-Fi Network Relay Module
 34 MagicHome       |       | MagicHome, Flux-light and some Arilux LC10 RGB(W) Led Controller
-35 Luani HVIO      |       | Luani ESP8266 Wifi I/O Module
-36 KMC 70011       |       | KMC Wifi Smart Socket with Energy Monitoring
+35 Luani HVIO      |       | Luani ESP8266 Wi-Fi I/O Module
+36 KMC 70011       |       | KMC Wi-Fi Smart Socket with Energy Monitoring
 37 Arilux LC01     |       | Arilux AL-LC01 RGB Led Controller
 38 Arilux LC11     |       | Arilux AL-LC11 RGBWW Led Controller
-39 Sonoff Dual R2  |   x   | Sonoff Dual R2 Wifi Smart Switch
+39 Sonoff Dual R2  |   x   | Sonoff Dual R2 Wi-Fi Smart Switch
 40 Arilux LC06     |       | Arilux AL-LC06 RGB(WW) Led Controller
-41 Sonoff S31      |       | Sonoff S31 Wifi Smart Socket with Energy Monitoring
-42 Zengge WF017    |       | Zengge WF017 Wifi RGB(W) Led Controller
-43 Sonoff Pow R2   |       | Sonoff Pow R2 Wifi Smart Switch with Energy Monitoring
-44 Sonoff iFan02   |   x   | Sonoff iFan02 Wifi Smart Ceiling Fan with Light
-45 BlitzWolf SHP   |       | BlitzWolf BW-SHP2, BW-SHP6, HomeCube SP1, Gosund SP111, Teckin SP22 Wifi Smart Switch with Energy Monitoring
-46 Shelly 1        |       | Shelly 1 Open Source Wifi Relay Module
-47 Shelly 2        |       | Shelly 2 Wifi 2-gang Relay Module with Energy Monitoring
-48 Xiaomi Philips  |   x   | Xiaomi Philips Wifi WW Led Bulb
-49 Neo Coolcam     |       | Neo Coolcam Wifi Smart Socket
-50 ESP Switch      |       | ESP Switch 4-gang Wifi Switch with Leds
-51 OBI Socket      |       | OBI Wifi Smart Socket
-52 Teckin          |       | Teckin SP22 Wifi Smart Switch with Energy Monitoring
-53 AplicWDP303075  |       | Aplic WDP 303075 CSL Wifi Smart Switch with Energy Monitoring
+41 Sonoff S31      |       | Sonoff S31 Wi-Fi Smart Socket with Energy Monitoring
+42 Zengge WF017    |       | Zengge WF017 Wi-Fi RGB(W) Led Controller
+43 Sonoff Pow R2   |       | Sonoff Pow R2 Wi-Fi Smart Switch with Energy Monitoring
+44 Sonoff iFan02   |   x   | Sonoff iFan02 Wi-Fi Smart Ceiling Fan with Light
+45 BlitzWolf SHP   |       | BlitzWolf BW-SHP2, BW-SHP6, HomeCube SP1, Gosund SP111, Teckin SP22 Wi-Fi Smart Switch with Energy Monitoring
+46 Shelly 1        |       | Shelly 1 Open Source Wi-Fi Relay Module
+47 Shelly 2        |       | Shelly 2 Wi-Fi 2-gang Relay Module with Energy Monitoring
+48 Xiaomi Philips  |   x   | Xiaomi Philips Wi-Fi WW Led Bulb
+49 Neo Coolcam     |       | Neo Coolcam Wi-Fi Smart Socket
+50 ESP Switch      |       | ESP Switch 4-gang Wi-Fi Switch with Leds
+51 OBI Socket      |       | OBI Wi-Fi Smart Socket
+52 Teckin          |       | Teckin SP22 Wi-Fi Smart Switch with Energy Monitoring
+53 AplicWDP303075  |       | Aplic WDP 303075 CSL Wi-Fi Smart Switch with Energy Monitoring
 54 TuyaMCU         |   x   | Devices with an MCU using Tuya communication protocol for control
-55 Gosund SP1 v23  |       | Gosund SP1 v2.3 Wifi Smart Switch with Energy Monitoring
-56 ARMTR Dimmer    |   x   | ARMtronix Wifi dimmer for Incandescent Lights and Led
-57 SK03 Outdoor    |   x   | SK03 Outdoor Wifi Smart Switch with Energy Monitoring
-58 PS-16-DZ        |   x   | PS-16-DZ  Wifi dimmer for Incandescent Lights and Led
-59 Teckin US       |       | Teckin SP20 and ZooZee SA102 Wifi Smart Switch with Energy Monitoring
-60 Manzoku strip   |       | Manzoku Wifi Smart Power Strip with four Relays
-61 OBI Socket 2    |       | OBI 2 Wifi Smart Socket
+55 Gosund SP1 v23  |       | Gosund SP1 v2.3 Wi-Fi Smart Switch with Energy Monitoring
+56 ARMTR Dimmer    |   x   | ARMtronix Wi-Fi dimmer for Incandescent Lights and Led
+57 SK03 Outdoor    |   x   | SK03 Outdoor Wi-Fi Smart Switch with Energy Monitoring
+58 PS-16-DZ        |   x   | PS-16-DZ  Wi-Fi dimmer for Incandescent Lights and Led
+59 Teckin US       |       | Teckin SP20 and ZooZee SA102 Wi-Fi Smart Switch with Energy Monitoring
+60 Manzoku strip   |       | Manzoku Wi-Fi Smart Power Strip with four Relays
+61 OBI Socket 2    |       | OBI 2 Wi-Fi Smart Socket
 62 YTF IR Bridge   |   x   | YTF Universal IR Bridge
-63 Digoo DG-SP202  |       | Digoo DG-SP202 Dual Wifi Smart Switch with Energy Monitoring
-64 KA10            |       | Smanergy KA10 Wifi Smart Wall Switch with Energy Monitoring
-65 Luminea ZX2820  |       | Luminea ZX2820 Wifi Smart Switch with Energy Monitoring
-66 Mi Desk Lamp    |       | Mi Desk Lamp with rotary switch and Wifi
-67 SP10            |       | Tuya SP10 Wifi Smart Switch with Energy Monitoring
-68 WAGA CHCZ02MB   |       | WAGA life CHCZ02MB Wifi Smart Switch with Energy Monitoring
-69 SYF05           |       | Sunyesmart SYF05 RGBWW Wifi Led Bulb
+63 Digoo DG-SP202  |       | Digoo DG-SP202 Dual Wi-Fi Smart Switch with Energy Monitoring
+64 KA10            |       | Smanergy KA10 Wi-Fi Smart Wall Switch with Energy Monitoring
+65 Luminea ZX2820  |       | Luminea ZX2820 Wi-Fi Smart Switch with Energy Monitoring
+66 Mi Desk Lamp    |       | Mi Desk Lamp with rotary switch and Wi-Fi
+67 SP10            |       | Tuya SP10 Wi-Fi Smart Switch with Energy Monitoring
+68 WAGA CHCZ02MB   |       | WAGA life CHCZ02MB Wi-Fi Smart Switch with Energy Monitoring
+69 SYF05           |       | Sunyesmart SYF05 RGBWW Wi-Fi Led Bulb
 70 Sonoff L1       |   x   | Sonoff L1 light strip
-71 Sonoff iFan03   |   x   | Sonoff iFan03 Wifi Smart Ceiling Fan with Light
-72 EXS Dimmer      |   x   | EXS Wifi Dimmer v4
+71 Sonoff iFan03   |   x   | Sonoff iFan03 Wi-Fi Smart Ceiling Fan with Light
+72 EXS Dimmer      |   x   | EXS Wi-Fi Dimmer v4
 73 PWM Dimmer      |   x   | Martin Jerry/acenx/Tessan/NTONPOWER SD0x PWM Dimmer Switches
-74 Sonoff D1       |   x   | Sonoff D1 Wifi and RF Dimmer
+74 Sonoff D1       |   x   | Sonoff D1 Wi-Fi and RF Dimmer
 75 Sonoff ZbBridge |   x   | Sonoff Zigbee bridge
 
 ### ESP32 based

RELEASENOTES.md

@@ -99,6 +99,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 ### Added
 - Command ``Status0`` providing all status information on a single line
 - Command ``TuyaSend5`` for hex string [#12211](https://github.com/arendst/Tasmota/issues/12211)
+- Command ``MqttWifiTimeout 100..20000`` to control MQTT Wi-Fi connection timeout default set to 200 mS [#12222](https://github.com/arendst/Tasmota/issues/12222)
 - Commands ``Color2`` and ``Dimmer4`` to allow retaining brightness ratio between white and color channels when setting dimmer for linked lights [#12072](https://github.com/arendst/Tasmota/issues/12072)
 - Extend command ``Wifi`` with Wi-Fi Mode Control [#12292](https://github.com/arendst/Tasmota/issues/12292)
 - Defines ``USER_RULE1``, ``USER_RULE2`` and ``USER_RULE3`` to store rules at compile time
@@ -137,7 +138,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - ESP32 increase log buffer from 4k to 6k to support longer messages
 - Move Settings from DRAM to heap
 - Refactor platformio configurations by Jason2866
-- WifiManager save wificonfig from settings, do it only once [#12242](https://github.com/arendst/Tasmota/issues/12242)
+- WifiManager save Wi-Fi configuration from settings, do it only once [#12242](https://github.com/arendst/Tasmota/issues/12242)
 - Improving SI7021 reading reliability by adjusting timers [#12256](https://github.com/arendst/Tasmota/issues/12256)
 - Refactor ESP32 partition selection, now via boards [#12257](https://github.com/arendst/Tasmota/issues/12257)
 - Use correct template for Home Assistant light [#12317](https://github.com/arendst/Tasmota/issues/12317)

tasmota/i18n.h

@@ -378,6 +378,7 @@
 #define D_CMND_MQTTPASSWORD "MqttPassword"
 #define D_CMND_MQTTKEEPALIVE "MqttKeepAlive"
 #define D_CMND_MQTTTIMEOUT "MqttTimeout"
+#define D_CMND_MQTTWIFITIMEOUT "MqttWifiTimeout"
 #define D_CMND_TLSKEY "TLSKey"
 #define D_CMND_FULLTOPIC "FullTopic"
 #define D_CMND_PREFIX "Prefix"