From 2a86cdb0d843f2c1a3a3d0202b259ed9774ecf76 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Sat, 11 Oct 2025 12:40:07 -0300
Subject: [PATCH] Op ntp server

---
 README.md               |  1 +
 data/igate_conf.json    |  1 +
 data_embed/index.html   | 15 +++++++++++++++
 data_embed/script.js    |  1 +
 include/configuration.h |  1 +
 src/LoRa_APRS_iGate.cpp |  4 ++--
 src/configuration.cpp   | 10 +++++++---
 src/ntp_utils.cpp       |  2 +-
 src/web_utils.cpp       |  1 +
 9 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5b7b094..3e49d24 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ ____________________________________________________
 
 # Timeline (Versions):
 
+- 2025-10-11 User defined NTP server added.
 - 2025-10-10 Changed Wiki into a pdf manual.
 - 2025-09-26 Heltec Wireless Bridge support added.
 - 2025-09-09 MQTT added (pub+sub), Status defined by Op now and many fixes more.
diff --git a/data/igate_conf.json b/data/igate_conf.json
index c480adc..362b20a 100644
--- a/data/igate_conf.json
+++ b/data/igate_conf.json
@@ -101,6 +101,7 @@
         "rfOnly": true
     },
     "ntp": {
+        "server": "pool.ntp.org",
         "gmtCorrection": 0.0
     },
     "other": {
diff --git a/data_embed/index.html b/data_embed/index.html
index 0cd32a8..0f389fa 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -1990,6 +1990,21 @@
                                 </small>
                             </div>
                             <div class="col-lg-9 col-sm-12">
+                                <div class="col-12">
+                                    <label
+                                        for="ntp.server"
+                                        class="form-label"
+                                        >NTP Server hostname</label
+                                    >
+                                    <div class="input-group">
+                                        <input
+                                            type="text"
+                                            name="ntp.server"
+                                            id="ntp.server"
+                                            class="form-control"
+                                        />
+                                    </div>
+                                </div>
                                 <div class="col-12">
                                     <label
                                         for="ntp.gmtCorrection"
diff --git a/data_embed/script.js b/data_embed/script.js
index f57fbf1..0cdd590 100644
--- a/data_embed/script.js
+++ b/data_embed/script.js
@@ -241,6 +241,7 @@ function loadSettings(settings) {
     document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
 
     // NTP
+    document.getElementById("ntp.server").value                         = settings.ntp.server;
     document.getElementById("ntp.gmtCorrection").value                  = settings.ntp.gmtCorrection;
 
     // Experimental
diff --git a/include/configuration.h b/include/configuration.h
index 1dc5a6a..2c653cb 100644
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -140,6 +140,7 @@ public:
 
 class NTP {
 public:
+    String  server;
     float   gmtCorrection;
 };
 
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 14024f1..abfd659 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -67,8 +67,8 @@ ___________________________________________________________________*/
 #endif
 
 
-String              versionDate             = "2025-09-26";
-String              versionNumber           = "3.1.2.1";
+String              versionDate             = "2025-10-11";
+String              versionNumber           = "3.1.3";
 Configuration       Config;
 WiFiClient          aprsIsClient;
 WiFiClient          mqttClient;
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 073d1fa..9eba716 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -140,6 +140,7 @@ bool Configuration::writeFile() {
         data["remoteManagement"]["managers"]        = remoteManagement.managers;
         data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
 
+        data["ntp"]["server"]                       = ntp.server;
         data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
 
         data["other"]["rebootMode"]                 = rebootMode;
@@ -345,7 +346,9 @@ bool Configuration::readFile() {
         remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
         remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
 
-        if (!data["ntp"].containsKey("gmtCorrection")) needsRewrite = true;
+        if (!data["ntp"].containsKey("server") ||
+            !data["ntp"].containsKey("gmtCorrection")) needsRewrite = true;
+        ntp.server                      = data["ntp"]["server"] | "pool.ntp.org";
         ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
 
         if (!data["other"].containsKey("rebootMode") ||
@@ -371,7 +374,7 @@ bool Configuration::readFile() {
         if (needsRewrite) {
             Serial.println("Config JSON incomplete, rewriting...");
             writeFile();
-            delay(500);
+            delay(1000);
             ESP.restart();
         } 
         Serial.println("Config read successfuly");
@@ -482,6 +485,7 @@ void Configuration::setDefaultValues() {
     remoteManagement.managers       = "";
     remoteManagement.rfOnly         = true;
 
+    ntp.server                      = "pool.ntp.org";
     ntp.gmtCorrection               = 0.0;
 
     rebootMode                      = false;
@@ -506,7 +510,7 @@ Configuration::Configuration() {
     if (!exists) {
         setDefaultValues();
         writeFile();
-        delay(500);
+        delay(1000);
         ESP.restart();
     }
 
diff --git a/src/ntp_utils.cpp b/src/ntp_utils.cpp
index 890ef53..bd42bf9 100644
--- a/src/ntp_utils.cpp
+++ b/src/ntp_utils.cpp
@@ -27,7 +27,7 @@
 extern      Configuration  Config;
 
 WiFiUDP     ntpUDP;
-NTPClient   timeClient(ntpUDP, "pool.ntp.org", 0, 15 * 60 * 1000);  // Update interval 15 min
+NTPClient   timeClient(ntpUDP, Config.ntp.server.c_str(), 0, 15 * 60 * 1000);  // Update interval 15 min
 
 
 namespace NTP_Utils {
diff --git a/src/web_utils.cpp b/src/web_utils.cpp
index 993528e..c629d0c 100644
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -281,6 +281,7 @@ namespace WEB_Utils {
         Config.remoteManagement.managers    = getParamStringSafe("remoteManagement.managers", Config.remoteManagement.managers);
         Config.remoteManagement.rfOnly      = request->hasParam("remoteManagement.rfOnly", true);
 
+        Config.ntp.server                   = getParamStringSafe("ntp.server", Config.ntp.server);
         Config.ntp.gmtCorrection            = getParamFloatSafe("ntp.gmtCorrection", Config.ntp.gmtCorrection);
 
         Config.rememberStationTime          = getParamIntSafe("other.rememberStationTime", Config.rememberStationTime);