mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6819 from s-hadinger/fix_dimmer 

Fix wrong Dimmer behavior introduced with #6799 when SetOption37 < 128
This commit is contained in:
Theo Arends 2019-11-02 21:56:21 +01:00 committed by GitHub
parent ba2439d9da bfcd156ee0
commit 99bdd1ff34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/_changelog.ino
View File

@ -2,6 +2,7 @@
* 7.0.0.2 20191102
* Add command WebColor19 to control color of Module and Name (#6811)
* Add support for Honeywell I2C HIH series Humidity and Temperetaure sensor (#6808)
* Fix wrong Dimmer behavior introduced with #6799 when SetOption37 < 128
*
* 7.0.0.1 20191027
* Remove references to versions before 6.0

22
tasmota/xdrv_04_light.ino
View File

@ -2163,11 +2163,12 @@ void CmndColorTemperature(void)
void CmndDimmer(void)
{
uint32_t dimmer;
if ((1 == XdrvMailbox.index) || (2 == XdrvMailbox.index)) { // Dimmer1 is RGB, Dimmer 2 iw white
dimmer = light_state.getDimmer(XdrvMailbox.index);
} else {
if (XdrvMailbox.index > 2) { XdrvMailbox.index = 1; }
if ((light_controller.isCTRGBLinked()) || (0 == XdrvMailbox.index)) {
dimmer = light_state.getDimmer();
} else {
dimmer = light_state.getDimmer(XdrvMailbox.index);
}
// Handle +/- special command
if (1 == XdrvMailbox.data_len) {
@ -2179,10 +2180,17 @@ void CmndDimmer(void)
}
// If value is ok, change it, otherwise report old value
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 100)) {
if ((1 == XdrvMailbox.index) || (2 == XdrvMailbox.index)) {
light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
} else {
if (light_controller.isCTRGBLinked()) {
// normal state, linked RGB and CW
light_controller.changeDimmer(XdrvMailbox.payload);
} else {
if (0 != XdrvMailbox.index) {
light_controller.changeDimmer(XdrvMailbox.payload, XdrvMailbox.index);
} else {
// change both dimmers
light_controller.changeDimmer(XdrvMailbox.payload, 1);
light_controller.changeDimmer(XdrvMailbox.payload, 2);
}
}
Light.update = true;
LightPreparePower();