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

Deduplicate xdrv_09_timers.ino also

Browse Source 
Turns out even TimerGetTimeOfDay was duplicate code from ApplyTimerOffsets
Did add a fix for the permanent day/night situation
This commit is contained in:
cybermaus 2022-10-25 22:39:30 +02:00 committed by GitHub
parent 0eebdf8620
commit a47f6baf2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/tasmota_xdrv_driver/xdrv_09_timers.ino
View File

@ -253,10 +253,10 @@ uint16_t TimerGetTimeOfDay(uint8_t index)
int16_t xtime = xtimer.time; int16_t xtime = xtimer.time;
#ifdef USE_SUNRISE #ifdef USE_SUNRISE
if (xtimer.mode) { if (xtimer.mode) {
if (xtime >= 12*60) xtime = 12*60 - xtime; ApplyTimerOffsets(&xtimer);
xtime += (int16_t)SunMinutes(xtimer.mode-1); xtime = xtimer.time;
if (xtime < 0) xtime += 24*60; if (xtime==2047 && xtimer.mode==1) xtime *= -1; // Sun always has already rises
if (xtime >= 24*60) xtime -= 24*60; if (xtime==2046 && xtimer.mode==2) xtime *= -1; // Sun always has already set
} }
#endif #endif
return xtime; return xtime;