patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Take DST into account when recalculating the sunrise sunset time

Browse Source 
If it is not considered the correct sunset / sunrise time is only calculated at the next day

Fixes: #2377
This commit is contained in:
Thomas Basler 2024-10-27 14:03:44 +01:00
parent 4594bcb23e
commit 225cab676a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SunPosition.cpp
View File

@ -7,6 +7,8 @@
#include "Utils.h" #include "Utils.h"
#include <Arduino.h> #include <Arduino.h>
#define CALC_UNIQUE_ID (((timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday) << 1 | timeinfo.tm_isdst)
SunPositionClass SunPosition; SunPositionClass SunPosition;
SunPositionClass::SunPositionClass() SunPositionClass::SunPositionClass()
@ -57,7 +59,7 @@ bool SunPositionClass::checkRecalcDayChanged() const
time(&now); time(&now);
localtime_r(&now, &timeinfo); // don't use getLocalTime() as there could be a delay of 10ms localtime_r(&now, &timeinfo); // don't use getLocalTime() as there could be a delay of 10ms
const uint32_t ymd = (timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday; const uint32_t ymd = CALC_UNIQUE_ID;
return _lastSunPositionCalculatedYMD != ymd; return _lastSunPositionCalculatedYMD != ymd;
} }
@ -67,7 +69,7 @@ void SunPositionClass::updateSunData()
struct tm timeinfo; struct tm timeinfo;
const bool gotLocalTime = getLocalTime(&timeinfo, 5); const bool gotLocalTime = getLocalTime(&timeinfo, 5);
_lastSunPositionCalculatedYMD = (timeinfo.tm_year << 9) | (timeinfo.tm_mon << 5) | timeinfo.tm_mday; _lastSunPositionCalculatedYMD = CALC_UNIQUE_ID;
setDoRecalc(false); setDoRecalc(false);
if (!gotLocalTime) { if (!gotLocalTime) {