Replaced enum-like class with 2 constants; various fix-ups based on PR reviews; added WPA2 Enterprise version of aio example script

Author: docmollo

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -31,25 +31,18 @@
 
 # pylint: disable=no-name-in-module
 
+from micropython import const
 from adafruit_esp32spi import adafruit_esp32spi
 import adafruit_esp32spi.adafruit_esp32spi_requests as requests
 
-class WiFiConnType: # pylint: disable=too-few-public-methods
-    """An enum-like class representing the different types of WiFi connections
-    that can be made. The values can be referenced like ``WiFiConnType.normal``.
-    Possible values are
-    - ``ThermocoupleType.normal``
-    - ``ThermocoupleType.enterprise``
-    """
-    # pylint: disable=invalid-name
-    normal = 1
-    enterprise = 2
-
 class ESPSPI_WiFiManager:
     """
     A class to help manage the Wifi connection
     """
-    def __init__(self, esp, secrets, status_pixel=None, attempts=2, wificonntype=WiFiConnType.normal):
+    NORMAL = const(1)
+    ENTERPRISE = const(2)
+
+    def __init__(self, esp, secrets, status_pixel=None, attempts=2, connection_type=NORMAL):
         """
         :param ESP_SPIcontrol esp: The ESP object we are using
         :param dict secrets: The WiFi and Adafruit IO secrets dict (See examples)
@@ -69,9 +62,9 @@ def __init__(self, esp, secrets, status_pixel=None, attempts=2, wificonntype=WiF
         self.ent_ssid = secrets['ent_ssid']
         self.ent_ident = secrets['ent_ident']
         self.ent_user = secrets['ent_user']
-        self.ent_passwd = secrets['ent_passwd']
+        self.ent_password = secrets['ent_password']
         self.attempts = attempts
-        self.wificonntype = wificonntype
+        self._connection_type = connection_type
         requests.set_interface(self._esp)
         self.statuspix = status_pixel
         self.pixel_status(0)
@@ -96,7 +89,7 @@ def connect(self):
             for access_pt in self._esp.scan_networks():
                 print("\t%s\t\tRSSI: %d" % (str(access_pt['ssid'], 'utf-8'), access_pt['rssi']))
         failure_count = 0
-        if self.wificonntype == WiFiConnType.normal:
+        if self._connection_type == ESPSPI_WiFiManager.NORMAL:
             while not self._esp.is_connected:
                 try:
                     if self.debug:
@@ -112,11 +105,11 @@ def connect(self):
                         failure_count = 0
                         self.reset()
                     continue
-        elif self.wificonntype == WiFiConnType.enterprise:
+        elif self._connection_type == ESPSPI_WiFiManager.ENTERPRISE:
             self._esp.wifi_set_network(bytes(self.ent_ssid, 'utf-8'))
             self._esp.wifi_set_entidentity(bytes(self.ent_ident, 'utf-8'))
             self._esp.wifi_set_entusername(bytes(self.ent_user, 'utf-8'))
-            self._esp.wifi_set_entpassword(bytes(self.ent_passwd, 'utf-8'))
+            self._esp.wifi_set_entpassword(bytes(self.ent_password, 'utf-8'))
             self._esp.wifi_set_entenable()
             while not self._esp.is_connected:
                 try:
@@ -133,8 +126,7 @@ def connect(self):
                         self.reset()
                     continue
         else:
-            print("Invalid connection type! Exiting...")
-            exit(1)
+            raise TypeError("Invalid WiFi connection type specified")
 
     def get(self, url, **kw):
         """

examples/esp32spi_wpa2ent_aio_post.py

@@ -0,0 +1,57 @@
+import time
+import board
+import busio
+from digitalio import DigitalInOut
+import neopixel
+from adafruit_esp32spi import adafruit_esp32spi
+from adafruit_esp32spi.adafruit_esp32spi_wifimanager import ESPSPI_WiFiManager
+
+print("ESP32 SPI WPA2 Enterprise webclient test")
+
+# 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
+
+# If you are using a board with pre-defined ESP32 Pins:
+esp32_cs = DigitalInOut(board.ESP_CS)
+esp32_ready = DigitalInOut(board.ESP_BUSY)
+esp32_reset = DigitalInOut(board.ESP_RESET)
+
+# If you have an externally connected ESP32:
+# esp32_cs = DigitalInOut(board.D9)
+# esp32_ready = DigitalInOut(board.D10)
+# esp32_reset = DigitalInOut(board.D5)
+
+spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
+esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
+"""Use below for Most Boards"""
+status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
+"""Uncomment below for ItsyBitsy M4"""
+#status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
+wifi = ESPSPI_WiFiManager(esp, secrets, status_light, connection_type=ESPSPI_WiFiManager.ENTERPRISE)
+
+counter = 0
+
+while True:
+    try:
+        print("Posting data...", end='')
+        data = counter
+        feed = 'test'
+        payload = {'value':data}
+        response = wifi.post(
+            "https://io.adafruit.com/api/v2/"+secrets['aio_username']+"/feeds/"+feed+"/data",
+            json=payload,
+            headers={"X-AIO-KEY":secrets['aio_key']})
+        print(response.json())
+        response.close()
+        counter = counter + 1
+        print("OK")
+    except (ValueError, RuntimeError) as e:
+        print("Failed to get data, retrying\n", e)
+        wifi.reset()
+        continue
+    response = None
+    time.sleep(15)