lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

calculate elapsed time rather than storing next fire time - avoids overflow issues

Browse Source
This commit is contained in:
Rick Watson
2018-10-23 13:55:25 +01:00
parent ec829173f9
commit b197ee8a80
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/APSettingsService.cpp
View File

@@ -1,15 +1,17 @@
#include <APSettingsService.h> #include <APSettingsService.h>
APSettingsService::APSettingsService(AsyncWebServer* server, FS* fs) : SettingsService(server, fs, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) { APSettingsService::APSettingsService(AsyncWebServer* server, FS* fs) : SettingsService(server, fs, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) {
onConfigUpdated();
} }
APSettingsService::~APSettingsService() {} APSettingsService::~APSettingsService() {}
void APSettingsService::loop() { void APSettingsService::loop() {
unsigned long now = millis(); unsigned long currentMillis = millis();
if (_manageAtMillis <= now){ unsigned long manageElapsed = (unsigned long)(currentMillis - _lastManaged);
if (manageElapsed >= MANAGE_NETWORK_DELAY){
_lastManaged = currentMillis;
manageAP(); manageAP();
_manageAtMillis = now + MANAGE_NETWORK_DELAY;
} }
handleDNS(); handleDNS();
} }
@@ -78,5 +80,5 @@ void APSettingsService::writeToJsonObject(JsonObject& root) {
} }
void APSettingsService::onConfigUpdated() { void APSettingsService::onConfigUpdated() {
_manageAtMillis = 0; _lastManaged = millis() - MANAGE_NETWORK_DELAY;
} }

2
src/APSettingsService.h
View File

@@ -42,7 +42,7 @@ class APSettingsService : public SettingsService {
String _password; String _password;
// for the mangement delay loop // for the mangement delay loop
unsigned long _manageAtMillis; unsigned long _lastManaged;
// for the captive portal // for the captive portal
DNSServer *_dnsServer; DNSServer *_dnsServer;