Switch examples for adafruit_ntp 3+

tannewt · tannewt · commit 77e3505b86a2 · 2022-05-12T16:47:30.000-07:00
The new version of the library uses standard sockets to fetch the
time from an NTP server.
diff --git a/docs/conf.py b/docs/conf.py
@@ -28,9 +28,7 @@
 autodoc_mock_imports = [
     "adafruit_binascii",
     "adafruit_logging",
-    "adafruit_requests",
     "adafruit_hashlib",
-    "adafruit_ntp",
     "adafruit_minimqtt",
 ]
 
diff --git a/examples/azureiot_esp32spi/azureiot_central_commands.py b/examples/azureiot_esp32spi/azureiot_central_commands.py
@@ -8,7 +8,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -53,11 +52,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_central_notconnected.py b/examples/azureiot_esp32spi/azureiot_central_notconnected.py
@@ -10,7 +10,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -55,11 +54,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_central_properties.py b/examples/azureiot_esp32spi/azureiot_central_properties.py
@@ -9,7 +9,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -54,11 +53,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_central_simpletest.py b/examples/azureiot_esp32spi/azureiot_central_simpletest.py
@@ -10,7 +10,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -55,11 +54,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_hub_directmethods.py b/examples/azureiot_esp32spi/azureiot_hub_directmethods.py
@@ -8,7 +8,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -53,11 +52,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_hub_messages.py b/examples/azureiot_esp32spi/azureiot_hub_messages.py
@@ -10,7 +10,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -55,11 +54,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_hub_simpletest.py b/examples/azureiot_esp32spi/azureiot_hub_simpletest.py
@@ -10,7 +10,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -55,11 +54,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_esp32spi/azureiot_hub_twin_operations.py b/examples/azureiot_esp32spi/azureiot_hub_twin_operations.py
@@ -9,7 +9,6 @@
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_ntp import NTP
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -54,11 +53,7 @@
 
 print("Getting the time...")
 
-ntp = NTP(esp)
-# Wait for a valid time to be received
-while not ntp.valid_time:
-    time.sleep(5)
-    ntp.set_time()
+rtc.RTC().datetime = time.localtime(esp.get_time()[0])
 
 print("Time:", str(time.time()))
 
diff --git a/examples/azureiot_native_networking/azureiot_central_commands.py b/examples/azureiot_native_networking/azureiot_central_commands.py
@@ -8,7 +8,7 @@
 import socketpool
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import IoTCentralDevice
 from adafruit_azureiot.iot_mqtt import IoTResponse
 
@@ -27,17 +27,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # To use Azure IoT Central, you will need to create an IoT Central app.
 # You can either create a free tier app that will live for 7 days without an Azure subscription,
diff --git a/examples/azureiot_native_networking/azureiot_central_notconnected.py b/examples/azureiot_native_networking/azureiot_central_notconnected.py
@@ -10,7 +10,7 @@
 import socketpool
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import (
     IoTCentralDevice,
     IoTError,
@@ -31,17 +31,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # To use Azure IoT Central, you will need to create an IoT Central app.
 # You can either create a free tier app that will live for 7 days without an Azure subscription,
diff --git a/examples/azureiot_native_networking/azureiot_central_properties.py b/examples/azureiot_native_networking/azureiot_central_properties.py
@@ -9,7 +9,7 @@
 import socketpool
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import IoTCentralDevice
 
 # Get wifi details and more from a secrets.py file
@@ -27,17 +27,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # To use Azure IoT Central, you will need to create an IoT Central app.
 # You can either create a free tier app that will live for 7 days without an Azure subscription,
diff --git a/examples/azureiot_native_networking/azureiot_central_simpletest.py b/examples/azureiot_native_networking/azureiot_central_simpletest.py
@@ -10,7 +10,7 @@
 import socketpool
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import IoTCentralDevice
 
 # Get wifi details and more from a secrets.py file
@@ -28,17 +28,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # To use Azure IoT Central, you will need to create an IoT Central app.
 # You can either create a free tier app that will live for 7 days without an Azure subscription,
diff --git a/examples/azureiot_native_networking/azureiot_hub_directmethods.py b/examples/azureiot_native_networking/azureiot_hub_directmethods.py
@@ -8,7 +8,7 @@
 import rtc
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import IoTHubDevice
 from adafruit_azureiot.iot_mqtt import IoTResponse
 
@@ -27,17 +27,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # You will need an Azure subscription to create an Azure IoT Hub resource
 #
diff --git a/examples/azureiot_native_networking/azureiot_hub_messages.py b/examples/azureiot_native_networking/azureiot_hub_messages.py
@@ -10,7 +10,7 @@
 import rtc
 import wifi
 
-import adafruit_requests
+import adafruit_ntp
 from adafruit_azureiot import IoTHubDevice
 
 # Get wifi details and more from a secrets.py file
@@ -28,17 +28,13 @@
 if time.localtime().tm_year < 2022:
     print("Setting System Time in UTC")
     pool = socketpool.SocketPool(wifi.radio)
-    requests = adafruit_requests.Session(pool, ssl.create_default_context())
-    response = requests.get("https://io.adafruit.com/api/v2/time/seconds")
-    if response:
-        if response.status_code == 200:
-            r = rtc.RTC()
-            r.datetime = time.localtime(int(response.text))
-            print(f"System Time: {r.datetime}")
-        else:
-            print("Setting time failed")
-    else:
-        print("Year seems good, skipping set time.")
+    ntp = adafruit_ntp.NTP(pool, tz_offset=0)
+
+    # NOTE: This changes the system time so make sure you aren't assuming that time
+    # doesn't jump.
+    rtc.RTC().datetime = ntp.datetime
+else:
+    print("Year seems good, skipping set time.")
 
 # You will need an Azure subscription to create an Azure IoT Hub resource
 #
diff --git a/examples/azureiot_native_networking/azureiot_hub_simpletest.py b/examples/azureiot_native_networking/azureiot_hub_simpletest.py
diff --git a/examples/azureiot_native_networking/azureiot_hub_twin_operations.py b/examples/azureiot_native_networking/azureiot_hub_twin_operations.py

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,7 @@`
`28`	`28`	`autodoc_mock_imports = [`
`29`	`29`	`"adafruit_binascii",`
`30`	`30`	`"adafruit_logging",`
`31`		`- "adafruit_requests",`
`32`	`31`	`"adafruit_hashlib",`
`33`		`- "adafruit_ntp",`
`34`	`32`	`"adafruit_minimqtt",`
`35`	`33`	`]`
`36`	`34`