From 66ce8399e56dbad4dd305997bf246c9e8d49ee6e Mon Sep 17 00:00:00 2001 From: Paul C Diem Date: Mon, 24 Feb 2020 21:09:38 -0600 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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