extmod/ntptime.py: Factor out ntptime module.

daviesian · daviesian · commit 4b4843f45eed · 2022-07-08T21:34:25.000+01:00
The ntptime module was previously only included in the ESP8266 port.
This commit factors that module out into the extmod directory.
diff --git a/extmod/ntptime.py b/extmod/ntptime.py
@@ -1,3 +1,5 @@
+import time
+
 try:
     import usocket as socket
 except:
@@ -7,9 +9,6 @@
 except:
     import struct
 
-# (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
-NTP_DELTA = 3155673600
-
 # The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
 host = "pool.ntp.org"
 
@@ -26,14 +25,26 @@ def time():
     finally:
         s.close()
     val = struct.unpack("!I", msg[40:44])[0]
+
+    EPOCH_YEAR = time.gmtime(0)[0]
+    if EPOCH_YEAR == 2000:
+        # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 3155673600
+    elif EPOCH_YEAR == 1970:
+        # (date(1970, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 2208988800
+    else:
+        raise Exception(
+            f"Unsupported EPOCH_YEAR provided in this port of MicroPython: {EPOCH_YEAR}. Cannot interpret NTP time."
+        )
+
     return val - NTP_DELTA
 
 
 # There's currently no timezone support in MicroPython, and the RTC is set in UTC time.
 def settime():
     t = time()
     import machine
-    import utime
 
-    tm = utime.gmtime(t)
+    tm = time.gmtime(t)
     machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
@@ -1,6 +1,6 @@
 freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
-freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,5 +1,4 @@
 freeze("$(BOARD_DIR)", "_boot.py", opt=3)
-freeze("$(PORT_DIR)/modules", ("apa102.py", "ntptime.py", "port_diag.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
@@ -1,4 +1,5 @@
 freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
@@ -2,6 +2,7 @@
 
 freeze("$(MPY_DIR)/tools", "upip.py")
 freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 
 if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
     freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`freeze("$(BOARD_DIR)", "_boot.py", opt=3)`
`2`		`-freeze("$(PORT_DIR)/modules", ("apa102.py", "ntptime.py", "port_diag.py"))`
`3`	`2`	`freeze("$(MPY_DIR)/drivers/dht", "dht.py")`
`4`	`3`	`freeze("$(MPY_DIR)/drivers/onewire")`
`5`	`4`	`include("$(MPY_DIR)/extmod/webrepl/manifest.py")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`freeze("$(PORT_DIR)/modules")`
	`2`	`+freeze("$(MPY_DIR)/extmod", "ntptime.py")`
`2`	`3`	`freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))`
`3`	`4`	`freeze("$(MPY_DIR)/drivers/dht", "dht.py")`
`4`	`5`	`freeze("$(MPY_DIR)/drivers/onewire")`