diff options
| author | Damien George <damien.p.george@gmail.com> | 2019-10-10 18:05:56 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-10-10 18:05:56 +1100 |
| commit | 79ab82ea77b0a924e96c2f6333e00c97706971ab (patch) | |
| tree | 2e5e70cbf538685df730bbafd597e7df2c60e769 | |
| parent | 580a2656d10cc7c1fc93e094d7eb71f04d99c329 (diff) | |
| download | micropython-79ab82ea77b0a924e96c2f6333e00c97706971ab.tar.gz micropython-79ab82ea77b0a924e96c2f6333e00c97706971ab.zip | |
esp8266/modules/ntptime.py: Always close socket, and set day-of-week.
Fixes issue #5189.
| -rw-r--r-- | ports/esp8266/modules/ntptime.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ports/esp8266/modules/ntptime.py b/ports/esp8266/modules/ntptime.py index 85c754af6c..1a1da65357 100644 --- a/ports/esp8266/modules/ntptime.py +++ b/ports/esp8266/modules/ntptime.py @@ -17,10 +17,12 @@ def time(): NTP_QUERY[0] = 0x1b addr = socket.getaddrinfo(host, 123)[0][-1] s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - s.settimeout(1) - res = s.sendto(NTP_QUERY, addr) - msg = s.recv(48) - s.close() + try: + s.settimeout(1) + res = s.sendto(NTP_QUERY, addr) + msg = s.recv(48) + finally: + s.close() val = struct.unpack("!I", msg[40:44])[0] return val - NTP_DELTA @@ -31,5 +33,4 @@ def settime(): import machine import utime tm = utime.localtime(t) - tm = tm[0:3] + (0,) + tm[3:6] + (0,) - machine.RTC().datetime(tm) + machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0)) |