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

Merge pull request #8296 from pcdiem/light-pallete-2 

Only advance to next palette color when fade is done
This commit is contained in:
Theo Arends 2020-04-28 09:20:17 +02:00 committed by GitHub
parent 3fef91d6ca 966d3522ad
commit dc802dc597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tasmota/xdrv_04_light.ino
View File

@ -1702,17 +1702,19 @@ void LightCycleColor(int8_t direction)
#ifdef USE_LIGHT_PALETTE #ifdef USE_LIGHT_PALETTE
if (Light.palette_count) { if (Light.palette_count) {
if (0 == direction) { if (!Light.fade_running) {
Light.wheel = random(Light.palette_count); if (0 == direction) {
} Light.wheel = random(Light.palette_count);
else {
Light.wheel += direction;
if (Light.wheel >= Light.palette_count) {
Light.wheel = 0;
if (direction < 0) Light.wheel = Light.palette_count - 1;
} }
else {
Light.wheel += direction;
if (Light.wheel >= Light.palette_count) {
Light.wheel = 0;
if (direction < 0) Light.wheel = Light.palette_count - 1;
}
}
LightSetPaletteEntry();
} }
LightSetPaletteEntry();
return; return;
} }
#endif // USE_LIGHT_PALETTE #endif // USE_LIGHT_PALETTE
@ -2232,27 +2234,21 @@ void calcGammaBulbs(uint16_t cur_col_10[5]) {
} }
#ifdef USE_DEVICE_GROUPS #ifdef USE_DEVICE_GROUPS
void LightSendDeviceGroupStatus(bool force) void LightSendDeviceGroupStatus(bool status)
{ {
static uint8_t last_channels[LST_MAX];
static uint8_t channels_sequence = 0;
static uint8_t last_bri; static uint8_t last_bri;
uint8_t bri = light_state.getBri(); uint8_t bri = light_state.getBri();
bool send_bri_update = (force || bri != last_bri); bool send_bri_update = (status || bri != last_bri);
if (Light.subtype > LST_SINGLE && !Light.devgrp_no_channels_out) { if (Light.subtype > LST_SINGLE && !Light.devgrp_no_channels_out) {
uint8_t channels[LST_MAX + 1]; static uint8_t channels[LST_MAX + 1] = { 0, 0, 0, 0, 0, 0 };
light_state.getChannels(channels); if (status) {
if (force || memcmp(last_channels, channels, LST_MAX) light_state.getChannels(channels);
#ifdef USE_LIGHT_PALETTE
|| (Settings.light_scheme && Light.palette_count)
#endif // USE_LIGHT_PALETTE
) {
memcpy(last_channels, channels, LST_MAX);
channels[LST_MAX] = ++channels_sequence;
SendLocalDeviceGroupMessage((send_bri_update ? DGR_MSGTYP_PARTIAL_UPDATE : DGR_MSGTYP_UPDATE), DGR_ITEM_LIGHT_CHANNELS, channels);
} }
else {
memcpy(channels, Light.new_color, LST_MAX);
channels[LST_MAX]++;
}
SendLocalDeviceGroupMessage((send_bri_update ? DGR_MSGTYP_PARTIAL_UPDATE : DGR_MSGTYP_UPDATE), DGR_ITEM_LIGHT_CHANNELS, channels);
} }
if (send_bri_update) { if (send_bri_update) {
last_bri = bri; last_bri = bri;