3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-27 13:17:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development03' into new_network

Browse source
This commit is contained in:
lumapu 2024-03-23 11:57:44 +01:00
commit ac7c80ddea
9 changed files with 126 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app.cpp
View file

@ -197,8 +197,13 @@ void app::regularTickers(void) {
#endif /*ENABLE_SIMULATOR*/
}
//-----------------------------------------------------------------------------
void app::onNtpUpdate(bool gotTime) {
mNtpReceived = true;
if ((0 == mSunrise) && (0.0 != mConfig->sun.lat) && (0.0 != mConfig->sun.lon)) {
mCalculatedTimezoneOffset = (int8_t)((mConfig->sun.lon >= 0 ? mConfig->sun.lon + 7.5 : mConfig->sun.lon - 7.5) / 15) * 3600;
tickCalcSunrise();
}
}
//-----------------------------------------------------------------------------
@ -229,10 +234,8 @@ void app::updateNtp(void) {
}
}
if ((0 == mSunrise) && (0.0 != mConfig->sun.lat) && (0.0 != mConfig->sun.lon)) {
mCalculatedTimezoneOffset = (int8_t)((mConfig->sun.lon >= 0 ? mConfig->sun.lon + 7.5 : mConfig->sun.lon - 7.5) / 15) * 3600;
tickCalcSunrise();
}
if(mNtpReceived)
onNtpUpdate(true);
mMqttReconnect = false;
}