Merge pull request #626 from croggero/dev

Fix for NTP blocking loop if connection is blocked

src/helpers.esp

@@ -19,21 +19,33 @@ void ICACHE_FLASH_ATTR parseBytes(const char *str, char sep, byte *bytes, int ma
 
 // This is part of the latest releases of Arduino for ESP8266
 // https://github.com/SensorsIot/NTP-time-for-ESP8266-and-ESP32/
-bool getNTPtime(int sec)
+void trySyncNTPtime(int retrySeconds)
 {
-	uint32_t start = millis();
-	time_t previousEpoch = epoch;
-	do
+	// If time since last sync is less then retry than update using last clock
+	if (millis() - lastNTPSync < retrySeconds * 1000)
 	{
-		time(&epoch);
-		localtime_r(&epoch, &timeinfo);
-		delay(10);
-	} while (((millis() - start) <= (1000 * sec)) && (timeinfo.tm_year < (2016 - 1900)));
+		epoch = lastNTPepoch + (int)(millis() - lastNTPSync) / 1000;
+		return;
+	}
+
+	time_t previousEpoch = epoch;
+	time(&epoch);
+	lastNTPSync = millis();
+	localtime_r(&epoch, &timeinfo);
+
 	if (timeinfo.tm_year <= (2016 - 1900))
 	{
+#if DEBUG
+		Serial.println("[DEBUG] NTP sync failed");
+#endif
+
 		epoch = previousEpoch; // fallback to previous value, so that you can use the manually set time
-		return false; // the NTP call was not successful
+		return;
 	}
 
-	return true;
+#if DEBUG
+		Serial.println("[DEBUG] NTP sync success");
+#endif
+
+	lastNTPepoch = epoch;
 }

src/main.cpp

@@ -95,6 +95,8 @@ uint8_t lastDoorState = 0;
 uint8_t lastTamperState = 0;
 unsigned long nextbeat = 0;
 time_t epoch;
+time_t lastNTPepoch;
+unsigned long lastNTPSync = 0;
 unsigned long openDoorMillis = 0;
 unsigned long previousLoopMillis = 0;
 unsigned long previousMillis = 0;
@@ -177,7 +179,8 @@ void ICACHE_RAM_ATTR loop()
 	deltaTime = currentMillis - previousLoopMillis;
 	uptimeSeconds = currentMillis / 1000;
 	previousLoopMillis = currentMillis;
-	getNTPtime(10);
+
+	trySyncNTPtime(10);
 
 	openLockButton.update();
 	if (config.openlockpin != 255 && openLockButton.fell())

src/wifi.esp

@@ -175,7 +175,7 @@ bool ICACHE_FLASH_ATTR connectSTA(const char *ssid, const char *password, byte b
 		configTime(0, 0, config.ntpServer);
 		// See https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv for Timezone codes for your region
 		setenv("TZ", config.tzInfo, 1);
-		getNTPtime(10);
+		trySyncNTPtime(10);
 		return true;
 	}
 	else