3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-26 04:37:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

ETH NTP update bugfix

Browse source
This commit is contained in:
geronet1 2024-01-22 11:06:48 +01:00
parent e039820dba
commit 643635bee1
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/app.cpp
View file

@ -172,7 +172,6 @@ void app::onNetwork(bool gotIp) {
mMqttReconnect = true;
mSunrise = 0; // needs to be set to 0, to reinstall sunrise and ivComm tickers!
once(std::bind(&app::tickNtpUpdate, this), 2, "ntp2");
//tickNtpUpdate();
#if !defined(ETHERNET)
if (WIFI_AP == WiFi.getMode()) {
mMqttEnabled = false;
@ -206,12 +205,7 @@ void app::regularTickers(void) {
#if defined(ETHERNET)
void app::onNtpUpdate(bool gotTime) {
uint32_t nxtTrig = 5; // default: check again in 5 sec
if (gotTime || mTimestamp != 0) {
this->updateNtp();
nxtTrig = gotTime ? 43200 : 60; // depending on NTP update success check again in 12 h or in 1 min
}
once(std::bind(&app::tickNtpUpdate, this), nxtTrig, "ntp");
mNtpReceived = true;
}
#endif /* defined(ETHERNET) */
@ -255,13 +249,22 @@ void app::updateNtp(void) {
//-----------------------------------------------------------------------------
void app::tickNtpUpdate(void) {
uint32_t nxtTrig = 5; // default: check again in 5 sec
bool isOK = false;
#if defined(ETHERNET)
bool isOK = (mTimestamp != 0);
mEth.updateNtpTime();
if (!mNtpReceived)
{
mEth.updateNtpTime();
}
else
{
mNtpReceived = false;
isOK = true;
}
#else
bool isOK = mWifi.getNtpTime();
isOK = mWifi.getNtpTime();
#endif
if (isOK || mTimestamp != 0) {
if (isOK) {
this->updateNtp();
nxtTrig = isOK ? (mConfig->ntp.interval * 60) : 60; // depending on NTP update success check again in 12h (depends on setting) or in 1 min
@ -565,6 +568,10 @@ void app::resetSystem(void) {
mSaveReboot = false;
mNetworkConnected = false;
#if defined(ETHERNET)
mNtpReceived = false;
#endif
}
//-----------------------------------------------------------------------------