jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 10:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into pwm-dimmer

Browse Source
This commit is contained in:
Paul Diem 2020-02-25 09:33:48 -06:00 committed by GitHub
commit 67a32bcbdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Device_Groups.md
View File

@ -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 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 ## Device Groups Operation

2
RELEASENOTES.md
View File

@ -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 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 initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764) - 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)

2
platformio_override_sample.ini
View File

@ -180,7 +180,7 @@ build_flags = ${esp82xx_defaults.build_flags}
[tasmota_core_stage] [tasmota_core_stage]
; *** Esp8266 core for Arduino version stable beta ; *** Esp8266 core for Arduino version stable beta
platform = espressif8266@2.3.3 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} build_flags = ${esp82xx_defaults.build_flags}
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
; NONOSDK221 ; NONOSDK221

3
tasmota/CHANGELOG.md
View File

@ -3,10 +3,11 @@
### 8.1.0.9 20200220 ### 8.1.0.9 20200220
- Revert most wifi connectivity changes introduced in 8.1.0.5 (#7746, #7602, #7621) - 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 initial support for Sensors AHT10 and AHT15 by Martin Wagner (#7596)
- Add support for Wemos Motor Shield V1 by Denis Sborets (#7764) - 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 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 ### 8.1.0.8 20200212

4
tasmota/my_user_config.h
View File

@ -415,9 +415,9 @@
//#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 EXS_MCU_CMNDS // Add command to send MCU commands (+0k8 code)
//#define USE_HOTPLUG // Add support for sensor HotPlug //#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 // 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 ---------------------- // -- Optional light modules ----------------------
#define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by // #define USE_WS2812 // WS2812 Led string using library NeoPixelBus (+5k code, +1k mem, 232 iram) - Disable by //

2
tasmota/support_command.ino
View File

@ -1677,7 +1677,7 @@ void CmndDevGroupShare(void)
ParseParameters(2, parm); ParseParameters(2, parm);
Settings.device_group_share_in = parm[0]; Settings.device_group_share_in = parm[0];
Settings.device_group_share_out = parm[1]; 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 #endif // USE_DEVICE_GROUPS

2
tasmota/xdrv_01_webserver.ino
View File

@ -2835,6 +2835,7 @@ void (* const WebCommand[])(void) PROGMEM = {
#ifdef USE_EMULATION #ifdef USE_EMULATION
void CmndEmulation(void) void CmndEmulation(void)
{ {
#if defined(USE_EMULATION_WEMO) || defined(USE_EMULATION_HUE)
#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)) { if ((XdrvMailbox.payload >= EMUL_NONE) && (XdrvMailbox.payload < EMUL_MAX)) {
#else #else
@ -2848,6 +2849,7 @@ void CmndEmulation(void)
Settings.flag2.emulation = XdrvMailbox.payload; Settings.flag2.emulation = XdrvMailbox.payload;
restart_flag = 2; restart_flag = 2;
} }
#endif
ResponseCmndNumber(Settings.flag2.emulation); ResponseCmndNumber(Settings.flag2.emulation);
} }
#endif // USE_EMULATION #endif // USE_EMULATION