net/ntptime/ntptime.py: Allow overriding default NTP host and timeout.

iabdalkader · iabdalkader · commit 4aadcff3f32d · 2022-10-25T08:35:48.000+02:00
* The default 1 second timeout is sometimes not enough depending on
the host and network latencies. This patch adds keyword args to `time()`
and `settime()` to allow overriding the default NTP host and timeout.
diff --git a/micropython/net/ntptime/ntptime.py b/micropython/net/ntptime/ntptime.py
@@ -8,18 +8,19 @@
     import ustruct as struct
 except:
     import struct
+from micropython import const
 
-# The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
-host = "pool.ntp.org"
+_DEFAULT_HOST = const("pool.ntp.org")
+_DEFAULT_TIMEOUT = const(1.0)
 
 
-def time():
+def time(timeout=_DEFAULT_TIMEOUT, host=_DEFAULT_HOST):
     NTP_QUERY = bytearray(48)
     NTP_QUERY[0] = 0x1B
     addr = socket.getaddrinfo(host, 123)[0][-1]
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     try:
-        s.settimeout(1)
+        s.settimeout(timeout)
         res = s.sendto(NTP_QUERY, addr)
         msg = s.recv(48)
     finally:
@@ -40,8 +41,8 @@ def time():
 
 
 # There's currently no timezone support in MicroPython, and the RTC is set in UTC time.
-def settime():
-    t = time()
+def settime(timeout=_DEFAULT_TIMEOUT, host=_DEFAULT_HOST):
+    t = time(timeout, host)
     import machine
 
     tm = utime.gmtime(t)
