Update examples to use settings.toml for credentials

make precommit happy with line wrapping

Author: mMerlin

adafruit_ntp.py

@@ -79,8 +79,9 @@ def _update_time_sync(self) -> None:
         is received within socket_timeout seconds, ArithmeticError for substantially incorrect
         NTP results."""
         if self._socket_address is None:
-            self._socket_address = self._pool.getaddrinfo(
-                self._server, self._port)[0][4]
+            self._socket_address = self._pool.getaddrinfo(self._server, self._port)[0][
+                4
+            ]
 
         self._packet[0] = 0b00100011  # Not leap second, NTP version 4, Client mode
         for i in range(1, PACKET_SIZE):
@@ -103,14 +104,18 @@ def _update_time_sync(self) -> None:
         srv_send_s, srv_send_f = struct.unpack_from("!II", self._packet, offset=40)
 
         # Convert the server times from NTP to UTC for local use
-        srv_recv_ns = (srv_recv_s - NTP_TO_UNIX_EPOCH) * 1_000_000_000 + \
-                      (srv_recv_f * 1_000_000_000 // 2**32)
-        srv_send_ns = (srv_send_s - NTP_TO_UNIX_EPOCH) * 1_000_000_000 + \
-                      (srv_send_f * 1_000_000_000 // 2**32)
+        srv_recv_ns = (srv_recv_s - NTP_TO_UNIX_EPOCH) * 1_000_000_000 + (
+            srv_recv_f * 1_000_000_000 // 2**32
+        )
+        srv_send_ns = (srv_send_s - NTP_TO_UNIX_EPOCH) * 1_000_000_000 + (
+            srv_send_f * 1_000_000_000 // 2**32
+        )
 
         # _round_trip_delay = (local_recv_ns - local_send_ns) - (srv_send_ns - srv_recv_ns)
         # Calculate (best estimate) offset between server UTC and board monotonic_ns time
-        clock_offset = ((srv_recv_ns - local_send_ns) + (srv_send_ns - local_recv_ns)) // 2
+        clock_offset = (
+            (srv_recv_ns - local_send_ns) + (srv_send_ns - local_recv_ns)
+        ) // 2
 
         self._monotonic_start_ns = clock_offset + self._tz_offset * 1_000_000_000
 
@@ -122,7 +127,9 @@ def datetime(self) -> time.struct_time:
             self._update_time_sync()
 
         # Calculate the current time based on the current and start monotonic times
-        current_time_s = (time.monotonic_ns() + self._monotonic_start_ns) // 1_000_000_000
+        current_time_s = (
+            time.monotonic_ns() + self._monotonic_start_ns
+        ) // 1_000_000_000
 
         return time.localtime(current_time_s)
 

examples/ntp_set_rtc.py

@@ -3,6 +3,7 @@
 
 """Example demonstrating how to set the realtime clock (RTC) based on NTP time."""
 
+import os
 import time
 
 import rtc
@@ -11,15 +12,19 @@
 
 import adafruit_ntp
 
-# Get wifi details and more from a secrets.py file
+# Get wifi AP credentials from a settings.toml file
+wifi_ssid = os.getenv("CIRCUITPY_WIFI_SSID")
+wifi_password = os.getenv("CIRCUITPY_WIFI_PASSWORD")
+if wifi_ssid is None:
+    print("WiFi credentials are kept in settings.toml, please add them there!")
+    raise ValueError("SSID not found in environment variables")
+
 try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
+    wifi.radio.connect(wifi_ssid, wifi_password)
+except ConnectionError:
+    print("Failed to connect to WiFi with provided credentials")
     raise
 
-wifi.radio.connect(secrets["ssid"], secrets["password"])
-
 pool = socketpool.SocketPool(wifi.radio)
 ntp = adafruit_ntp.NTP(pool, tz_offset=0, cache_seconds=3600)
 

examples/ntp_simpletest.py

@@ -3,22 +3,27 @@
 
 """Print out time based on NTP."""
 
+import os
 import time
 
 import socketpool
 import wifi
 
 import adafruit_ntp
 
-# Get wifi details and more from a secrets.py file
+# Get wifi AP credentials from a settings.toml file
+wifi_ssid = os.getenv("CIRCUITPY_WIFI_SSID")
+wifi_password = os.getenv("CIRCUITPY_WIFI_PASSWORD")
+if wifi_ssid is None:
+    print("WiFi credentials are kept in settings.toml, please add them there!")
+    raise ValueError("SSID not found in environment variables")
+
 try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
+    wifi.radio.connect(wifi_ssid, wifi_password)
+except ConnectionError:
+    print("Failed to connect to WiFi with provided credentials")
     raise
 
-wifi.radio.connect(secrets["ssid"], secrets["password"])
-
 pool = socketpool.SocketPool(wifi.radio)
 ntp = adafruit_ntp.NTP(pool, tz_offset=0, cache_seconds=3600)