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

Fix lint errors

Browse Source
This commit is contained in:
Thomas Basler 2023-02-20 20:19:23 +01:00
parent dc309e9616
commit 97bc964b6c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/SunPosition.cpp
View File

@ -45,8 +45,8 @@ void SunPositionClass::updateSunData()
} }
_sun.setCurrentDate(1900 + timeinfo.tm_year, timeinfo.tm_mon + 1, timeinfo.tm_mday); _sun.setCurrentDate(1900 + timeinfo.tm_year, timeinfo.tm_mon + 1, timeinfo.tm_mday);
_sunriseMinutes = (int)_sun.calcCustomSunrise(SunSet::SUNSET_NAUTICAL); _sunriseMinutes = static_cast<int>(_sun.calcCustomSunrise(SunSet::SUNSET_NAUTICAL));
_sunsetMinutes = (int)_sun.calcCustomSunset(SunSet::SUNSET_NAUTICAL); _sunsetMinutes = static_cast<int>(_sun.calcCustomSunset(SunSet::SUNSET_NAUTICAL));
uint minutesPastMidnight = timeinfo.tm_hour * 60 + timeinfo.tm_min; uint minutesPastMidnight = timeinfo.tm_hour * 60 + timeinfo.tm_min;
_isDayPeriod = (minutesPastMidnight >= _sunriseMinutes) && (minutesPastMidnight < _sunsetMinutes); _isDayPeriod = (minutesPastMidnight >= _sunriseMinutes) && (minutesPastMidnight < _sunsetMinutes);
@ -59,12 +59,13 @@ bool SunPositionClass::sunsetTime(struct tm* info)
time_t aTime = time(NULL); time_t aTime = time(NULL);
// Set the time to midnight // Set the time to midnight
struct tm* tm = localtime(&aTime); struct tm tm;
tm->tm_sec = 0; localtime_r(&aTime, &tm);
tm->tm_min = _sunsetMinutes; tm.tm_sec = 0;
tm->tm_hour = 0; tm.tm_min = _sunsetMinutes;
tm->tm_isdst = -1; tm.tm_hour = 0;
time_t midnight = mktime(tm); tm.tm_isdst = -1;
time_t midnight = mktime(&tm);
localtime_r(&midnight, info); localtime_r(&midnight, info);
return _isValidInfo; return _isValidInfo;
@ -76,12 +77,13 @@ bool SunPositionClass::sunriseTime(struct tm* info)
time_t aTime = time(NULL); time_t aTime = time(NULL);
// Set the time to midnight // Set the time to midnight
struct tm* tm = localtime(&aTime); struct tm tm;
tm->tm_sec = 0; localtime_r(&aTime, &tm);
tm->tm_min = _sunriseMinutes; tm.tm_sec = 0;
tm->tm_hour = 0; tm.tm_min = _sunriseMinutes;
tm->tm_isdst = -1; tm.tm_hour = 0;
time_t midnight = mktime(tm); tm.tm_isdst = -1;
time_t midnight = mktime(&tm);
localtime_r(&midnight, info); localtime_r(&midnight, info);
return _isValidInfo; return _isValidInfo;