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

Merge pull request #4913 from chaosmaster/patch-1 

light: improve handling of dimmer_plugin (fix rules)
This commit is contained in:
Theo Arends 2019-01-13 15:22:09 +01:00 committed by GitHub
parent e80b713072 bab1e4e6ac
commit 28d23ea70a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sonoff/xdrv_04_light.ino
View File

@ -111,6 +111,7 @@ uint8_t light_wheel = 0;
uint8_t light_subtype = 0;
uint8_t light_device = 0;
uint8_t light_power = 0;
uint8_t light_old_power = 1;
uint8_t light_update = 1;
uint8_t light_wakeup_active = 0;
uint8_t light_wakeup_dimmer = 0;
@ -715,11 +716,12 @@ void LightRandomColor(void)
void LightSetPower(void)
{
// light_power = XdrvMailbox.index;
light_old_power = light_power;
light_power = bitRead(XdrvMailbox.index, light_device -1);
if (light_wakeup_active) {
light_wakeup_active--;
}
if (light_power) {
if (light_power && !light_old_power) {
light_update = 1;
}
LightAnimate();
@ -828,7 +830,10 @@ void LightAnimate(void)
}
}
}
XdrvMailbox.index = light_device;
char *tmp_data = XdrvMailbox.data;
uint16_t tmp_data_len = XdrvMailbox.data_len;
XdrvMailbox.data = (char*)cur_col;
XdrvMailbox.data_len = sizeof(cur_col);
if (XdrvCall(FUNC_SET_CHANNELS)) {
@ -842,6 +847,8 @@ void LightAnimate(void)
else if (light_type > LT_WS2812) {
LightMy92x1Duty(cur_col[0], cur_col[1], cur_col[2], cur_col[3], cur_col[4]);
}
XdrvMailbox.data = tmp_data;
XdrvMailbox.data_len = tmp_data_len;
}
}
}