jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix on undef TIMERS (#20123)

Browse Source 
fix compilation error
This commit is contained in:
stefanbode 2023-11-30 08:54:08 +01:00 committed by GitHub
parent 47bc321ebb
commit 9a010bdf7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/tasmota_xdrv_driver/xdrv_29_deepsleep.ino
View File

@ -136,7 +136,7 @@ void DeepSleepCalculate()
// default add to the next wakeup. May be overwritten by "Wakeup" rule // default add to the next wakeup. May be overwritten by "Wakeup" rule
RtcSettings.nextwakeup += Settings->deepsleep; RtcSettings.nextwakeup += Settings->deepsleep;
#if defined(USE_RULES) #if defined(USE_RULES) && defined(USE_TIMERS)
if (RtcTime.valid) { if (RtcTime.valid) {
if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); } // Midnight if (!RtcTime.hour && !RtcTime.minute && !RtcTime.second) { TimerSetRandomWindows(); } // Midnight
if (Settings->flag3.timers_enable) { if (Settings->flag3.timers_enable) {
@ -170,7 +170,7 @@ void DeepSleepCalculate()
} }
} }
} //if (RtcTime.valid) } //if (RtcTime.valid)
#endif // USE_RULES #endif // USE_RULES && TIMERS
} }
@ -250,20 +250,27 @@ void DeepSleepEverySecond(void)
AddLog(LOG_LEVEL_ERROR, PSTR("Error Wifi no connect %d [s]. Deepsleep"), DEEPSLEEP_NETWORK_TIMEOUT); AddLog(LOG_LEVEL_ERROR, PSTR("Error Wifi no connect %d [s]. Deepsleep"), DEEPSLEEP_NETWORK_TIMEOUT);
deepsleep_flag = DEEPSLEEP_START_COUNTDOWN; // Start deepsleep in 4 seconds deepsleep_flag = DEEPSLEEP_START_COUNTDOWN; // Start deepsleep in 4 seconds
} }
#if defined(USE_RULES) #if defined(USE_RULES) && defined(USE_TIMERS)
if (!deepsleep_flag) { if (!deepsleep_flag) {
//AddLog(LOG_LEVEL_ERROR, PSTR("DSL: timers %d, rule: %d, once %d, comb %d, bitr %d"),Settings->flag3.timers_enable, Settings->rule_enabled, Settings->rule_once, Settings->rule_enabled | Settings->rule_once, bitRead(Settings->rule_enabled | Settings->rule_once, 0));
if (Settings->flag3.timers_enable && GetRule(0) == "Wakeup" if (Settings->flag3.timers_enable && GetRule(0) == "Wakeup"
&& bitRead(Settings->rule_enabled | Settings->rule_once, 0) ) { && bitRead(Settings->rule_enabled | Settings->rule_once, 0) ) {
//AddLog(LOG_LEVEL_ERROR, PSTR("DSL: Start timer"));
deepsleep_flag = 60; deepsleep_flag = 60;
} }
return; return;
} }
//AddLog(LOG_LEVEL_ERROR, PSTR("DSL: wakeup: %d, timer %d, rules %d"),GetRule(0) == "Wakeup", Settings->flag3.timers_enable, bitRead(Settings->rule_enabled | Settings->rule_once, 0));
if (GetRule(0) == "Wakeup" && ( !Settings->flag3.timers_enable || !bitRead(Settings->rule_enabled | Settings->rule_once, 0) )) { if (GetRule(0) == "Wakeup" && ( !Settings->flag3.timers_enable || !bitRead(Settings->rule_enabled | Settings->rule_once, 0) )) {
deepsleep_flag = 0; deepsleep_flag = 0;
Settings->deepsleep = 0; Settings->deepsleep = 0;
//AddLog(LOG_LEVEL_ERROR, PSTR("DSL: Stop timer"));
return; return;
} }
#else
if (!deepsleep_flag) { return; }
#endif #endif
deepsleep_flag--; deepsleep_flag--;
AddLog(LOG_LEVEL_ERROR, PSTR("DSL: Countdown: %d"),deepsleep_flag); AddLog(LOG_LEVEL_ERROR, PSTR("DSL: Countdown: %d"),deepsleep_flag);
if (DeepSleepEnabled()) { if (DeepSleepEnabled()) {