From ad2ecc45f310e95e28ef654f63567115ce5be129 Mon Sep 17 00:00:00 2001
From: Max Prokhorov <prokhorov.max@outlook.com>
Date: Thu, 21 Mar 2019 05:57:57 +0300
Subject: [PATCH] Generate sync interval exactly once

---
 code/espurna/ntp.ino | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino
index e0f66990..153df10e 100644
--- a/code/espurna/ntp.ino
+++ b/code/espurna/ntp.ino
@@ -50,22 +50,16 @@ void _ntpWantSync() {
     _ntp_want_sync = true;
 }
 
-int _ntpSyncInterval() {
+// Randomized in time to avoid clogging the server with simultaious requests from multiple devices
+// (for example, when multiple devices start up at the same time)
+int inline _ntpSyncInterval() {
     return secureRandom(NTP_SYNC_INTERVAL, NTP_SYNC_INTERVAL * 2);
 }
 
-int _ntpUpdateInterval() {
+int inline _ntpUpdateInterval() {
     return secureRandom(NTP_UPDATE_INTERVAL, NTP_UPDATE_INTERVAL * 2);
 }
 
-void inline _ntpSetSyncInterval(bool shortInterval = false) {
-    if (shortInterval) {
-        setSyncInterval(_ntpSyncInterval());
-    } else {
-        setSyncInterval(_ntpUpdateInterval());
-    }
-}
-
 void _ntpStart() {
 
     _ntpConfigure();
@@ -79,7 +73,8 @@ void _ntpStart() {
     // Avoid triggering sync immediatly by canceling sync provider flag and resetting sync interval again
     setSyncProvider(_ntpSyncProvider);
     _ntp_want_sync = false;
-    _ntpSetSyncInterval(true);
+
+    setSyncInterval(NTPw.getShortInterval());
 
 }
 
@@ -111,9 +106,6 @@ void _ntpConfigure() {
     uint8_t dst_region = getSetting("ntpRegion", NTP_DST_REGION).toInt();
     NTPw.setDSTZone(dst_region);
 
-    // Set short interval to sync again shortly, randomized in time to avoid clogging the server with simultaious requests from multiple devices (i.e. on power surge, when devices start up at the same time)
-    setSyncInterval(true);
-
     // Some remote servers can be slow to respond, increase accordingly
     // TODO does this need upper constrain?
     NTPw.setNTPTimeout(getSetting("ntpTimeout", NTP_TIMEOUT).toInt());