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

Add dummy fade2 (#10916)

This commit is contained in:
Theo Arends 2021-02-11 16:03:04 +01:00
parent a10c7c2235
commit 19dc2393fa
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tasmota/xdrv_04_light.ino
View File

@ -2828,58 +2828,62 @@ void CmndRgbwwTable(void)
void CmndFade(void) void CmndFade(void)
{ {
// Fade - Show current Fade state if (2 == XdrvMailbox.index) {
// Fade 0 - Turn Fade Off // Home Assistant backwards compatibility, can be removed mid 2021
// Fade On - Turn Fade On } else {
// Fade Toggle - Toggle Fade state // Fade - Show current Fade state
switch (XdrvMailbox.payload) { // Fade 0 - Turn Fade Off
case 0: // Off // Fade On - Turn Fade On
case 1: // On // Fade Toggle - Toggle Fade state
Settings.light_fade = XdrvMailbox.payload; switch (XdrvMailbox.payload) {
break; case 0: // Off
case 2: // Toggle case 1: // On
Settings.light_fade ^= 1; Settings.light_fade = XdrvMailbox.payload;
break; break;
case 2: // Toggle
Settings.light_fade ^= 1;
break;
}
#ifdef USE_DEVICE_GROUPS
if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendDeviceGroupMessage(Light.device, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
#endif // USE_DEVICE_GROUPS
if (!Settings.light_fade) { Light.fade_running = false; }
} }
#ifdef USE_DEVICE_GROUPS
if (XdrvMailbox.payload >= 0 && XdrvMailbox.payload <= 2) SendDeviceGroupMessage(Light.device, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_FADE, Settings.light_fade);
#endif // USE_DEVICE_GROUPS
if (!Settings.light_fade) { Light.fade_running = false; }
ResponseCmndStateText(Settings.light_fade); ResponseCmndStateText(Settings.light_fade);
} }
void CmndSpeed(void) void CmndSpeed(void)
{ {
if (XdrvMailbox.index == 2) { if (2 == XdrvMailbox.index) {
if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 40)) { if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 40)) {
Light.fade_once_enabled = true; Light.fade_once_enabled = true;
Light.fade_once_value = XdrvMailbox.payload > 0; Light.fade_once_value = (XdrvMailbox.payload > 0);
Light.speed_once_enabled = true; Light.speed_once_enabled = true;
Light.speed_once_value = XdrvMailbox.payload; Light.speed_once_value = XdrvMailbox.payload;
if (!Light.fade_once_value) { Light.fade_running = false; } if (!Light.fade_once_value) { Light.fade_running = false; }
} }
return; ResponseCmndNumber(Light.speed_once_value);
} } else {
// Speed 1 - Fast
// Speed 1 - Fast // Speed 40 - Very slow
// Speed 40 - Very slow // Speed + - Increment Speed
// Speed + - Increment Speed // Speed - - Decrement Speed
// Speed - - Decrement Speed if (1 == XdrvMailbox.data_len) {
if (1 == XdrvMailbox.data_len) { if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) {
if (('+' == XdrvMailbox.data[0]) && (Settings.light_speed > 1)) { XdrvMailbox.payload = Settings.light_speed - 1;
XdrvMailbox.payload = Settings.light_speed - 1; }
else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) {
XdrvMailbox.payload = Settings.light_speed + 1;
}
} }
else if (('-' == XdrvMailbox.data[0]) && (Settings.light_speed < 40)) { if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
XdrvMailbox.payload = Settings.light_speed + 1; Settings.light_speed = XdrvMailbox.payload;
}
}
if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 40)) {
Settings.light_speed = XdrvMailbox.payload;
#ifdef USE_DEVICE_GROUPS #ifdef USE_DEVICE_GROUPS
SendDeviceGroupMessage(Light.device, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SPEED, Settings.light_speed); SendDeviceGroupMessage(Light.device, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_SPEED, Settings.light_speed);
#endif // USE_DEVICE_GROUPS #endif // USE_DEVICE_GROUPS
}
ResponseCmndNumber(Settings.light_speed);
} }
ResponseCmndNumber(Settings.light_speed);
} }
void CmndWakeupDuration(void) void CmndWakeupDuration(void)