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

Merge pull request #4490 from andrethomas/patch-1 

Prevent sleep and SetOption36 Conflict
This commit is contained in:
Theo Arends 2018-11-30 19:36:12 +01:00 committed by GitHub
parent d7df73784f 3613946f18
commit 2969b29378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/settings.ino
View File

@ -857,6 +857,7 @@ void SettingsDelta(void)
}
if (Settings.version < 0x0603000A) {
Settings.param[P_LOOP_SLEEP_DELAY] = LOOP_SLEEP_DELAY;
Settings.sleep = 0; // We do not want sleep enabled when SetOption36 is active
}
if (Settings.version < 0x0603000E) {
Settings.flag2.calc_resolution = CALC_RESOLUTION;

11
sonoff/sonoff.ino
View File

@ -587,6 +587,11 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
}
else if (CMND_SLEEP == command_code) {
if ((payload >= 0) && (payload < 251)) {
if (payload > 0) {
snprintf_P(log_data, sizeof(log_data), PSTR("*** WARNING *** - Disabling SetOption36 (Dynamic Sleep) in favour of sleep"));
AddLog(LOG_LEVEL_INFO);
Settings.param[P_LOOP_SLEEP_DELAY] = 0; // We do not want SetOption36 to be active along with traditional sleep
}
Settings.sleep = payload;
sleep = payload;
WiFiSetSleepMode();
@ -756,6 +761,12 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
param_low = 1;
param_high = 250;
break;
case P_LOOP_SLEEP_DELAY:
if (payload > 0) {
snprintf_P(log_data, sizeof(log_data), PSTR("*** WARNING *** - Disabling sleep in favour of SetOption36 (Dynamic Sleep)"));
AddLog(LOG_LEVEL_INFO);
Settings.sleep = 0; // We do not want traditional sleep to be enabled along side SetOption36
}
}
if ((payload >= param_low) && (payload <= param_high)) {
Settings.param[pindex] = payload;