mirror of
https://github.com/lumapu/ahoy.git
synced 2025-06-15 00:51:38 +02:00
0.8.970001 zero-export
Merge branch 'development03' into zero-export
This commit is contained in:
commit
6f931d620b
9 changed files with 126 additions and 11 deletions
11
src/app.cpp
11
src/app.cpp
|
@ -248,8 +248,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();
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@ -280,10 +285,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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue