From 597d43319f52178c6b3b435394f1e76da917da1a Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 6 Dec 2019 11:18:00 +0100 Subject: [PATCH] Maintenance Release 7.1.2 --- .github/ISSUE_TEMPLATE/Bug_report.md | 24 ++++++++++++------------ README.md | 2 +- RELEASENOTES.md | 4 +++- platformio_override_sample.ini | 25 +++++++++++++++---------- platformio_tasmota_env.ini | 1 + tasmota/CHANGELOG.md | 12 +++++++++--- tasmota/tasmota.h | 2 +- tasmota/tasmota_version.h | 2 +- tasmota/xdrv_04_light.ino | 8 ++++++-- 9 files changed, 49 insertions(+), 31 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 847958093..4b4027bf8 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -38,31 +38,31 @@ _Make sure your have performed every step and checked the applicable boxes befor - [ ] Self-compiled - [ ] IDE / Compiler used: _____ - [ ] Flashing tools used: _____ -- [ ] Provide the output of command: ``Backlog Template; Module; GPIO``: - ``` +- [ ] Provide the output of command: `Backlog Template; Module; GPIO 255`: +``` Configuration output here: - ``` -- [ ] If using rules, provide the output of this command: ``Backlog Rule1; Rule2; Rule3``: - ``` +``` +- [ ] If using rules, provide the output of this command: `Backlog Rule1; Rule2; Rule3`: +``` Rules output here: - ``` -- [ ] Provide the output of this command: ``Status 0``: - ``` +``` +- [ ] Provide the output of this command: `Status 0`: +``` STATUS 0 output here: - ``` +``` - [ ] Provide the output of the Console log output when you experience your issue; if applicable: - _(Please use_ ``weblog 4`` _for more debug information)_ - ``` + _(Please use_ `weblog 4` _for more debug information)_ +``` Console output here: - ``` +``` ### TO REPRODUCE _Steps to reproduce the behavior:_ diff --git a/README.md b/README.md index 7b101df63..acb6430d5 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-v7.1.1.x-blue.svg)](https://github.com/arendst/Tasmota) +[![Dev Version](https://img.shields.io/badge/development%20version-v7.1.2.x-blue.svg)](https://github.com/arendst/Tasmota) [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://thehackbox.org/tasmota/) [![Build Status](https://img.shields.io/travis/arendst/Tasmota.svg)](https://travis-ci.org/arendst/Tasmota) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 51d078352..0baecb42a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -51,4 +51,6 @@ The following binary downloads have been compiled with ESP8266/Arduino library c - Fix lost functionality of GPIO9 and GPIO10 on some devices (#7080) - Fix Zigbee uses Hardware Serial if GPIO 1/3 or GPIO 13/15 and SerialLog 0 (#7071) -- Change light color schemes 2, 3 and 4 from color wheel to Hue driven +- Fix WS2812 power control (#7090) +- Change light color schemes 2, 3 and 4 from color wheel to Hue driven with user Saturation control +- Change log buffer size from 520 to 700 characters accomodating full rule text (#7110) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 9827447dd..6cbd749c4 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -28,6 +28,7 @@ default_envs = [common] platform = ${core_active.platform} +platform_packages = ${core_active.platform_packages} build_flags = ${core_active.build_flags} ; *** Use settings from file user_config_override.h -DUSE_CONFIG_OVERRIDE @@ -72,6 +73,7 @@ build_flags = ${core_2_6_1.build_flags} ;platform = ${core_2_6_2.platform} ;build_flags = ${core_2_6_2.build_flags} ;platform = ${core_stage.platform} +;platform_packages = ${core_stage.platform_packages} ;build_flags = ${core_stage.build_flags} @@ -85,11 +87,11 @@ build_flags = ${esp82xx_defaults.build_flags} ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; NONOSDK22x_190313 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) +; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105) -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) +; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) +; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 ; NONOSDK3V0 (known issues) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 @@ -129,11 +131,11 @@ build_flags = ${esp82xx_defaults.build_flags} ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; NONOSDK22x_190313 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 = 2.2.2-dev(38a443e) (Tasmota default) +; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105) -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 = 2.2.2-dev(5ab15d1) +; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 = 2.2.2-dev(bb83b9b) +; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 ; NONOSDK3V0 (known issues) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 @@ -165,7 +167,8 @@ build_flags = ${esp82xx_defaults.build_flags} [core_stage] ; *** Esp8266 core for Arduino version latest beta -platform = https://github.com/platformio/platform-espressif8266.git#feature/stage +platform = espressif8266@2.3.1 +platform_packages = framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git build_flags = ${esp82xx_defaults.build_flags} -Wl,-Teagle.flash.1m.ld -DBEARSSL_SSL_BASIC @@ -173,12 +176,14 @@ build_flags = ${esp82xx_defaults.build_flags} ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK221 ; NONOSDK22x_190313 ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190313 -; NONOSDK22x_190703 (Tasmota default) +; NONOSDK22x_190703 = 2.2.1+100-dev(38a443e) (Tasmota default) (Firmware 2K smaller than NONOSDK22x_191105) -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -; NONOSDK22x_191024 +; NONOSDK22x_191024 = 2.2.1+111-dev(5ab15d1) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191024 -; NONOSDK22x_191105 +; NONOSDK22x_191105 = 2.2.1+113-dev(bb83b9b) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191105 +; NONOSDK22x_191122 = 2.2.1+119-dev(a58da79) +; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122 ; NONOSDK3V0 (known issues) ; -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK3 ; lwIP 1.4 diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini index 46e71d7af..38aaf2223 100644 --- a/platformio_tasmota_env.ini +++ b/platformio_tasmota_env.ini @@ -1,5 +1,6 @@ [env] platform = ${common.platform} +platform_packages = ${common.platform_packages} framework = ${common.framework} board = ${common.board} board_build.flash_mode = ${common.board_build.flash_mode} diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index c639e5392..9d8e5cb72 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -1,12 +1,18 @@ ## Unreleased (development) +## Released + +### 7.1.2 20191206 + +- Maintenance Release + ### 7.1.1.1 20191201 - Fix lost functionality of GPIO9 and GPIO10 on some devices (#7080) - Fix Zigbee uses Hardware Serial if GPIO 1/3 or GPIO 13/15 and SerialLog 0 (#7071) -- Change light color schemes 2, 3 and 4 from color wheel to Hue driven - -## Released +- Fix WS2812 power control (#7090) +- Change light color schemes 2, 3 and 4 from color wheel to Hue driven with user Saturation control +- Change log buffer size from 520 to 700 characters accomodating full rule text (#7110) ### 7.1.1 20191201 diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h index d9e55bd15..cefef3a06 100644 --- a/tasmota/tasmota.h +++ b/tasmota/tasmota.h @@ -119,7 +119,7 @@ const uint16_t INPUT_BUFFER_SIZE = 520; // Max number of characters in (seri const uint16_t FLOATSZ = 16; // Max number of characters in float result from dtostrfd (max 32) const uint16_t CMDSZ = 24; // Max number of characters in command const uint16_t TOPSZ = 100; // Max number of characters in topic string -const uint16_t LOGSZ = 520; // Max number of characters in log +const uint16_t LOGSZ = 700; // Max number of characters in log const uint16_t MIN_MESSZ = 893; // Min number of characters in MQTT message const uint8_t SENSOR_MAX_MISS = 5; // Max number of missed sensor reads before deciding it's offline diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 54e4c165f..f8eee8abd 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x07010101; +const uint32_t VERSION = 0x07010200; #endif // _TASMOTA_VERSION_H_ diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino index 0ef3f1ea9..7f1e66fc6 100644 --- a/tasmota/xdrv_04_light.ino +++ b/tasmota/xdrv_04_light.ino @@ -1571,6 +1571,7 @@ void LightAnimate(void) { uint8_t cur_col[LST_MAX]; uint16_t light_still_on = 0; + bool power_off = false; Light.strip_timer_counter++; if (!Light.power) { // All channels powered off @@ -1578,6 +1579,9 @@ void LightAnimate(void) if (!Light.fade_running) { sleep = Settings.sleep; } + if (Settings.light_scheme >= LS_MAX) { + power_off = true; + } } else { if (Settings.sleep > PWM_MAX_SLEEP) { sleep = PWM_MAX_SLEEP; // set a maxumum value of 50 milliseconds to ensure that animations are smooth @@ -1629,7 +1633,7 @@ void LightAnimate(void) } } - if (Settings.light_scheme < LS_MAX) { // exclude WS281X Neopixel + if ((Settings.light_scheme < LS_MAX) || power_off) { // exclude WS281X Neopixel schemes // Apply power modifiers to Light.new_color LightApplyPower(Light.new_color, Light.power); @@ -1714,7 +1718,7 @@ void LightAnimate(void) cur_col_10bits[i] = orig_col_10bits[Light.color_remap[i]]; } - if (!Settings.light_fade) { // no fade + if (!Settings.light_fade || power_off) { // no fade // record the current value for a future Fade memcpy(Light.fade_start_8, cur_col, sizeof(Light.fade_start_8)); memcpy(Light.fade_start_10, cur_col_10bits, sizeof(Light.fade_start_10));