Merge pull request #2561 from kattni/circuitpython-internet-test

Update demo, add settings.toml

Author: kattni

ESP32_S2_WiFi_Tests/CPy_Native_WiFi_Test/code.py

@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
+import os
 import ipaddress
 import ssl
 import wifi
@@ -13,52 +14,50 @@
 JSON_QUOTES_URL = "https://www.adafruit.com/api/quotes.php"
 JSON_STARS_URL = "https://api.github.com/repos/adafruit/circuitpython"
 
-# Get wifi details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
-
 print("ESP32-S2 WebClient Test")
 
-print("My MAC addr:", [hex(i) for i in wifi.radio.mac_address])
+print(f"My MAC address: {[hex(i) for i in wifi.radio.mac_address]}")
 
 print("Available WiFi networks:")
 for network in wifi.radio.start_scanning_networks():
     print("\t%s\t\tRSSI: %d\tChannel: %d" % (str(network.ssid, "utf-8"),
-            network.rssi, network.channel))
+                                             network.rssi, network.channel))
 wifi.radio.stop_scanning_networks()
 
-print("Connecting to %s"%secrets["ssid"])
-wifi.radio.connect(secrets["ssid"], secrets["password"])
-print("Connected to %s!"%secrets["ssid"])
-print("My IP address is", wifi.radio.ipv4_address)
+print(f"Connecting to {os.getenv('WIFI_SSID')}")
+wifi.radio.connect(os.getenv("WIFI_SSID"), os.getenv("WIFI_PASSWORD"))
+print(f"Connected to {os.getenv('WIFI_SSID')}")
+print(f"My IP address: {wifi.radio.ipv4_address}")
 
-ipv4 = ipaddress.ip_address("8.8.4.4")
-print("Ping google.com: %f ms" % (wifi.radio.ping(ipv4)*1000))
+ping_ip = ipaddress.IPv4Address("8.8.8.8")
+ping = wifi.radio.ping(ip=ping_ip) * 1000
+if ping is not None:
+    print(f"Ping google.com: {ping} ms")
+else:
+    ping = wifi.radio.ping(ip=ping_ip)
+    print(f"Ping google.com: {ping} ms")
 
 pool = socketpool.SocketPool(wifi.radio)
 requests = adafruit_requests.Session(pool, ssl.create_default_context())
 
-print("Fetching text from", TEXT_URL)
+print(f"Fetching text from {TEXT_URL}")
 response = requests.get(TEXT_URL)
 print("-" * 40)
 print(response.text)
 print("-" * 40)
 
-print("Fetching json from", JSON_QUOTES_URL)
+print(f"Fetching json from {JSON_QUOTES_URL}")
 response = requests.get(JSON_QUOTES_URL)
 print("-" * 40)
 print(response.json())
 print("-" * 40)
 
 print()
 
-print("Fetching and parsing json from", JSON_STARS_URL)
+print(f"Fetching and parsing json from {JSON_STARS_URL}")
 response = requests.get(JSON_STARS_URL)
 print("-" * 40)
-print("CircuitPython GitHub Stars", response.json()["stargazers_count"])
+print(f"CircuitPython GitHub Stars: {response.json()['stargazers_count']}")
 print("-" * 40)
 
-print("done")
+print("Done")

ESP32_S2_WiFi_Tests/CPy_Native_WiFi_Test/settings.toml

@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2023 Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+
+# This is where you store the credentials necessary for your code.
+# The associated demo only requires WiFi, but you can include any
+# credentials here, such as Adafruit IO username and key, etc.
+WIFI_SSID = "your-wifi-ssid"
+WIFI_PASSWORD = "your-wifi-password"