From 4e05975b6c4cc411b4c1228eaab3fc56582bbfec Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 14 May 2020 12:40:48 +0200 Subject: [PATCH 1/3] Sync with released 8.3.0 --- README.md | 2 +- RELEASENOTES.md | 8 ++++---- tasmota/CHANGELOG.md | 6 ++++++ tasmota/tasmota_version.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4fa7d6e4a..8c8d7c024 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ In addition to the [release webpage](https://github.com/arendst/Tasmota/releases ## Development -[![Dev Version](https://img.shields.io/badge/development%20version-v8.2.x.x-blue.svg)](https://github.com/arendst/Tasmota) +[![Dev Version](https://img.shields.io/badge/development%20version-v8.3.x.x-blue.svg)](https://github.com/arendst/Tasmota) [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://thehackbox.org/tasmota/) [![Tasmota CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22) [![Tasmota ESP32 CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20ESP32%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index cd4f55cf1..46868414b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -21,7 +21,7 @@ While fallback or downgrading is common practice it was never supported due to S ## Supported Core versions -This release will be supported from ESP8266/Arduino library Core version **2.6.3 + e64cb61** due to reported security and stability issues on previous Core version. This will also support gzipped binaries. +This release will be supported from ESP8266/Arduino library Core version **2.7.0** due to reported security and stability issues on previous Core version. This will also support gzipped binaries. Although it might still compile on previous Core versions all support will be removed in the near future. @@ -35,7 +35,7 @@ For initial configuration this release supports Webserver based **WifiManager** ## Provided Binary Downloads -The following binary downloads have been compiled with ESP8266/Arduino library core version **2.6.3 + e64cb61**. +The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.0**. - **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY** - **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages. @@ -52,7 +52,7 @@ The following binary downloads have been compiled with ESP8266/Arduino library c ## Changelog -### Version 8.2.0.6 +### Version 8.3.0 Fred - Breaking Change Device Groups multicast address and port (#8270) - Change PWM implementation to Arduino #7231 removing support for Core versions before 2.6.3 @@ -103,6 +103,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c - Add support for analog anemometer by Matteo Albinola (#8283) - Add support for OpenTherm by Yuriy Sannikov (#8373) - Add support for Thermostat control by arijav (#8212) -- Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt +- Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt - Add automatic compression of Rules to achieve ~60% compression by Stefan Hadinger - Add rule trigger at root level like ``on loadavg<50 do power 2 endon`` after ``state`` command diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index d059823d0..4c981f3d0 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -1,5 +1,11 @@ ## Unreleased (development) +## Released + +### 8.3.0 20200514 + +- Release Fred + ### 8.2.0.6 20200501 - Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 610798621..8bf2e98a9 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 = 0x08020006; +const uint32_t VERSION = 0x08030000; // Lowest compatible version const uint32_t VERSION_COMPATIBLE = 0x07010006; From 31fe7296497789692f75b0f67bac284a4fdc3a48 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 14 May 2020 12:50:47 +0200 Subject: [PATCH 2/3] Core 2.7.1.not 2.7.0 --- RELEASENOTES.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 46868414b..cd45b7f20 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -21,7 +21,7 @@ While fallback or downgrading is common practice it was never supported due to S ## Supported Core versions -This release will be supported from ESP8266/Arduino library Core version **2.7.0** due to reported security and stability issues on previous Core version. This will also support gzipped binaries. +This release will be supported from ESP8266/Arduino library Core version **2.7.1** due to reported security and stability issues on previous Core version. This will also support gzipped binaries. Although it might still compile on previous Core versions all support will be removed in the near future. @@ -35,7 +35,7 @@ For initial configuration this release supports Webserver based **WifiManager** ## Provided Binary Downloads -The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.0**. +The following binary downloads have been compiled with ESP8266/Arduino library core version **2.7.1**. - **tasmota.bin** = The Tasmota version with most drivers. **RECOMMENDED RELEASE BINARY** - **tasmota-BG.bin** to **tasmota-TW.bin** = The Tasmota version in different languages. From fff26f6538ef14ac9ab42114e13569e08db38c6d Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 14 May 2020 15:32:27 +0200 Subject: [PATCH 3/3] Fix button default state - Fix button default state - Bump version 8.3.0.1 --- RELEASENOTES.md | 55 ++--------------------------------- tasmota/CHANGELOG.md | 4 +++ tasmota/settings.ino | 1 + tasmota/support_button_v2.ino | 6 ++-- tasmota/tasmota_version.h | 2 +- 5 files changed, 11 insertions(+), 57 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index cd45b7f20..5b5d1bebe 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -52,57 +52,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c ## Changelog -### Version 8.3.0 Fred +### Version 8.3.0.1 -- Breaking Change Device Groups multicast address and port (#8270) -- Change PWM implementation to Arduino #7231 removing support for Core versions before 2.6.3 -- Change default PWM Frequency to 977 Hz from 880 Hz -- Change minimum PWM Frequency from 100 Hz to 40 Hz -- Change flash access removing support for any Core before 2.6.3 -- Change HM-10 sensor type detection and add features (#7962) -- Change light scheme 2,3,4 cycle time speed from 24,48,72,... seconds to 4,6,12,24,36,48,... seconds (#8034) -- Change remove floating point libs from IRAM -- Change remove MQTT Info messages on restart for DeepSleep Wake (#8044) -- Change IRremoteESP8266 library updated to v2.7.6 -- Change HAss discovery by Federico Leoni (#8370) -- Fix possible Relay toggle on (OTA) restart -- Fix PWM flickering during wifi connection (#8046) -- Fix Zigbee sending wrong Sat value with Hue emulation -- Fix Zigbee crash with Occupancy sensor (#8089) -- Add Zigbee command ``ZbRestore`` to restore device configuration dumped with ``ZbStatus 2`` -- Add Zigbee command ``ZbUnbind`` -- Add Zigbee command ``ZbBindState`` and ``manuf``attribute -- Add Zigbee command ``ZbConfig`` and configuration in Settings -- Add commands ``CounterDebounceLow`` and ``CounterDebounceHigh`` to control debouncing (#8021) -- Add commands ``NrfPage``, ``NrfIgnore``, ``NrfScan`` and ``NrfBeacon`` to NRF24 Bluetooth driver (#8075) -- Add commands ``GlobalTemp`` and ``GlobalHum`` to init sensor data (#8152) -- Add command ``SO`` as shortcut for command ``SetOption`` -- Add command ``SetOption41 `` to force sending gratuitous ARP every seconds -- Add command ``SetOption73 1`` for button decoupling and send multi-press and hold MQTT messages by Federico Leoni (#8235) -- Add command ``SetOption90 1`` to disable non-json MQTT messages (#8044) -- Add command ``SetOption91 1`` to enable fading at startup / power on -- Add command ``SetOption92 1`` to set PWM Mode from regular PWM to ColorTemp control (Xiaomi Philips ...) -- Add command ``SetOption93 1`` to control caching of compressed rules -- Add command ``Sensor10 0/1/2`` to control BH1750 resolution - 0 = High (default), 1 = High2, 2 = Low (#8016) -- Add command ``Sensor10 31..254`` to control BH1750 measurement time which defaults to 69 (#8016) -- Add command ``Sensor18 0..32000`` to control PMS5003 sensor interval to extend lifetime by Gene Ruebsamen (#8128) -- Add command ``DevGroupName`` to specify up to four Device Group Names (#8087) -- Add command ``DevGroupSend`` to send an update to a Device Group (#8093) -- Add command ``Ping`` (#7176) -- Add command ``Palette`` to add the ability to specify a palette of colors (#8150) -- Add support for unreachable (unplugged) Zigbee devices in Philips Hue emulation and Alexa -- Add support for 64x48 SSD1306 OLED (#6740) -- Add support for Seven Segment display using HT16K33 (#8116) -- Add support for up to four MQTT GroupTopics (#8014) -- Add support for longer template names -- Add support for an iAQ sensor (#8107) -- Add support for AS3935 Lightning Sensor by device111 (#8130) -- Add console command history (#7483, #8015) -- Add quick wifi reconnect using saved AP parameters when ``SetOption56 0`` (#3189) -- Add more accuracy to GPS NTP server (#8088) -- Add support for analog anemometer by Matteo Albinola (#8283) -- Add support for OpenTherm by Yuriy Sannikov (#8373) -- Add support for Thermostat control by arijav (#8212) -- Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt -- Add automatic compression of Rules to achieve ~60% compression by Stefan Hadinger -- Add rule trigger at root level like ``on loadavg<50 do power 2 endon`` after ``state`` command +- Fix default state of ``SetOption73 0`` for button decoupling and send multi-press and hold MQTT messages diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index 4c981f3d0..32a900f2c 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -1,5 +1,9 @@ ## Unreleased (development) +### 8.3.0.1 20200514 + +- Fix default state of ``SetOption73 0`` for button decoupling and send multi-press and hold MQTT messages + ## Released ### 8.3.0 20200514 diff --git a/tasmota/settings.ino b/tasmota/settings.ino index de890ee41..2e7c04b7a 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -1391,6 +1391,7 @@ void SettingsDelta(void) #endif // ESP8266 if (Settings.version < 0x08020004) { + Settings.flag3.mqtt_buttons = 0; // SetOption73 (0) - Decouple button from relay and send just mqtt topic #ifdef ESP8266 Settings.config_version = 0; // ESP8266 (Has been 0 for long time) #endif // ESP8266 diff --git a/tasmota/support_button_v2.ino b/tasmota/support_button_v2.ino index 4dc94cf13..688c2e4eb 100644 --- a/tasmota/support_button_v2.ino +++ b/tasmota/support_button_v2.ino @@ -182,14 +182,14 @@ void ButtonHandler(void) else { 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, SetOption73 (0) - Decouple button from relay and send just mqtt topic - if (!Settings.flag3.mqtt_buttons) { + if (Settings.flag.button_single) { // SetOption13 (0) - Allow only single button press for immediate action, + if (!Settings.flag3.mqtt_buttons) { // SetOption73 (0) - Decouple button from relay and send just mqtt topic 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)) { // Execute Toggle command via MQTT if ButtonTopic is set ExecuteCommandPower(button_index +1, POWER_TOGGLE, SRC_BUTTON); // Execute Toggle command internally } } else { - MqttButtonTopic(button_index +1, 1, 0); // SetOption73 (0) - Decouple button from relay and send just mqtt topic + MqttButtonTopic(button_index +1, 1, 0); // SetOption73 1 - Decouple button from relay and send just mqtt topic } } else { Button.press_counter[button_index] = (Button.window_timer[button_index]) ? Button.press_counter[button_index] +1 : 1; diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 8bf2e98a9..e0fa3a3ce 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 = 0x08030000; +const uint32_t VERSION = 0x08030001; // Lowest compatible version const uint32_t VERSION_COMPATIBLE = 0x07010006;