3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-10 15:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix #209

Browse source
This commit is contained in:
lumapu 2022-08-30 15:49:33 +02:00
parent 2bfb6467e0
commit b67cd033d2
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tools/esp8266/app.cpp
View file

@ -53,14 +53,11 @@ void app::loop(void) {
mWebInst->loop(); mWebInst->loop();
if(checkTicker(&mUptimeTicker, mUptimeInterval)) { if(checkTicker(&mUptimeTicker, mUptimeInterval)) {
mUptimeSecs++; if(millis() - mPrevMillis >= 1000) {
if(0 != mTimestamp) mPrevMillis += 1000;
mTimestamp++; mUptimeSecs++;
else { if(0 != mTimestamp)
if(!apActive) { mTimestamp++;
mTimestamp = mWifi->getNtpTime();
DPRINTLN(DBG_INFO, "[NTP]: " + getDateTimeStr(mTimestamp));
}
} }
} }
@ -662,9 +659,10 @@ const char* app::getFieldStateClass(uint8_t fieldId) {
void app::resetSystem(void) { void app::resetSystem(void) {
mUptimeSecs = 0; mUptimeSecs = 0;
mUptimeTicker = 0xffffffff; mUptimeTicker = 0xffffffff;
mUptimeInterval = 1000; // [ms] mUptimeInterval = 500; // [ms]
mPrevMillis = 0;
mNtpRefreshTicker = 0xffffffff; mNtpRefreshTicker = 0;
mNtpRefreshInterval = NTP_REFRESH_INTERVAL; // [ms] mNtpRefreshInterval = NTP_REFRESH_INTERVAL; // [ms]
#ifdef AP_ONLY #ifdef AP_ONLY

1
tools/esp8266/app.h
View file

@ -224,6 +224,7 @@ class app {
uint32_t mUptimeTicker; uint32_t mUptimeTicker;
uint16_t mUptimeInterval; uint16_t mUptimeInterval;
uint32_t mUptimeSecs; uint32_t mUptimeSecs;
uint32_t mPrevMillis;
uint8_t mHeapStatCnt; uint8_t mHeapStatCnt;
uint32_t mNtpRefreshTicker; uint32_t mNtpRefreshTicker;
uint32_t mNtpRefreshInterval; uint32_t mNtpRefreshInterval;