jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16807 from cybermaus/Make-%timerN%-solar-aware

Browse Source 
Fix %timerN% rule variables for SunRise/Sunset timers
This commit is contained in:
Theo Arends 2022-10-13 17:06:43 +02:00 committed by GitHub
commit 799dea913a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino
View File

@ -1459,6 +1459,18 @@ bool findNextVariableValue(char * &pVarname, float &value)
uint32_t index = sVarName.substring(5).toInt(); uint32_t index = sVarName.substring(5).toInt();
if (index > 0 && index <= MAX_TIMERS) { if (index > 0 && index <= MAX_TIMERS) {
value = Settings->timer[index -1].time; value = Settings->timer[index -1].time;
#if defined(USE_SUNRISE)
// Correct %timerN% values for sunrise/sunset timers
if (Settings->timer[index -1].mode == 1 || Settings->timer[index -1].mode == 2) {
// in this context, time variable itself is merely an offset, with <720 being negative
value += -720 + SunMinutes(Settings->timer[index -1].mode -1);
}
if (Settings->timer[index -1].mode == 2) {
// To aid rule comparative statements, sunset past midnight (high lattitudes) is expressed past 24h00
// So sunset at 00h45 is at 24h45
if (value<360) { value += 1440; }
}
#endif // USE_SUNRISE
} }
#if defined(USE_SUNRISE) #if defined(USE_SUNRISE)
} else if (sVarName.equals(F("SUNRISE"))) { } else if (sVarName.equals(F("SUNRISE"))) {