From 459b45bb27663637fa509b9fbe74495fded0de75 Mon Sep 17 00:00:00 2001 From: Adrian Scillato <39969427+ascillato2@users.noreply.github.com> Date: Fri, 29 Nov 2019 20:18:26 -0300 Subject: [PATCH 1/3] Fix grammar in Bot Message --- .github/issue-close-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/issue-close-app.yml b/.github/issue-close-app.yml index 0fcb996ab..8e981441b 100644 --- a/.github/issue-close-app.yml +++ b/.github/issue-close-app.yml @@ -10,7 +10,7 @@ comment: >- Filling the template is required so standard questions don't need to be asked again each time. Our ability to provide assistance is greatly hampered if few minutes are not taken to complete the issue template with the requested information. The details requested potentially affect which options to pursue. The small amount - of time you spend completing the template will also help the volunteers providing the assistance to you, to reduce + of time you will spend completing the template will also help the volunteers, providing assistance to you, to reduce the time required to help you. Please, could you be so kind on completing the [issue template](https://github.com/arendst/Tasmota/issues/new/choose) in order to have more information so as to properly help you? From 09f91044658cc46ee4e31357173745d01b555e26 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 30 Nov 2019 15:36:15 +0100 Subject: [PATCH 2/3] Bump version 7.1.0.1 --- tasmota/CHANGELOG.md | 1 + tasmota/tasmota_version.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index 259095dc3..2810f3373 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -1,5 +1,6 @@ ## Unreleased (development) +### 7.1.0.1 20191130 ## Released diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index bb71cb5f2..7484f5bc9 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 = 0x07010000; +const uint32_t VERSION = 0x07010001; #endif // _TASMOTA_VERSION_H_ From 5524075b04e28548e71254ae01205a58d02ecaac Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 30 Nov 2019 16:05:09 +0100 Subject: [PATCH 3/3] Fix slider for devices without RGB Fix slider for devices with one or two channels like only white or white/yellow --- tasmota/CHANGELOG.md | 2 ++ tasmota/xdrv_01_webserver.ino | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tasmota/CHANGELOG.md b/tasmota/CHANGELOG.md index 2810f3373..235471a07 100644 --- a/tasmota/CHANGELOG.md +++ b/tasmota/CHANGELOG.md @@ -2,6 +2,8 @@ ### 7.1.0.1 20191130 +- Fix slider for devices with one or two channels like only white or white/yellow + ## Released ### 7.1.0 20191129 diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index 42630b8ba..48e2cd26a 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -154,9 +154,11 @@ const char HTTP_SCRIPT_ROOT[] PROGMEM = const char HTTP_SCRIPT_ROOT_PART2[] PROGMEM = "function lc(v,i,p){" - "if(v=='h'||v=='d'){" // Hue or Brightness changed so change Saturation colors too - "var sl=eb('sl4').value;" - "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';" + "if(eb('s')){" // Check if Saturation is in DOM otherwise javascript fails on la() + "if(v=='h'||v=='d'){" // Hue or Brightness changed so change Saturation colors too + "var sl=eb('sl4').value;" + "eb('s').style.background='linear-gradient(to right,rgb('+sl+'%%,'+sl+'%%,'+sl+'%%),hsl('+eb('sl2').value+',100%%,50%%))';" + "}" "}" "la('&'+v+i+'='+p);" "}"