WiFi manager done and examples updated

Author: Melissa LeBlanc-Williams

adafruit_esp32spi/adafruit_esp32spi_wifimanager.py

@@ -30,6 +30,7 @@
 """
 
 import neopixel
+from adafruit_esp32spi import adafruit_esp32spi
 import adafruit_esp32spi.adafruit_esp32spi_requests as requests
 
 class ESPSPI_WiFiManager:
@@ -76,31 +77,34 @@ def get(self, url, **kw):
         """
         Pass the Get request to requests and update Status NeoPixel
         """
+        if not self._esp.is_connected:
+            self.connect()
         self.neo_status((100, 100, 0))
         return_val = requests.get(url, **kw)
-        self.neo_status((0, 0, 100))
+        self.neo_status(0)
         return return_val
 
     def post(self, url, **kw):
         """
         Pass the Post request to requests and update Status NeoPixel
         """
+        if not self._esp.is_connected:
+            self.connect()
         self.neo_status((100, 100, 0))
         return_val = requests.post(url, **kw)
-        self.neo_status((0, 0, 100))
+        self.neo_status(0)
         return return_val
 
-    def ping(self, host):
+    def ping(self, host, ttl=250):
         """
-        Pass the Ping request to requests and update Status NeoPixel
+        Pass the Ping request to the ESP32, update Status NeoPixel, return response time
         """
+        if not self._esp.is_connected:
+            self.connect()
         self.neo_status((100, 100, 0))
-        #Blink the LED Green
-        #Send Stuff to Requests
-        #stop Blinking LED
-        #Return Result
-        self.neo_status((0, 0, 100))
-        return None
+        response_time = self._esp.ping(host, ttl=ttl)
+        self.neo_status(0)
+        return response_time
 
     def neo_status(self, value):
         """

examples/esp32spi_aio_post.py

@@ -1,60 +1,35 @@
-
 import time
 import board
 import busio
 from digitalio import DigitalInOut
 
 from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_esp32spi.adafruit_esp32spi_requests as requests
-
+from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 
 print("ESP32 SPI webclient test")
 
 # Get wifi details and more from a settings.py file
 try:
     from esp32spi_settings import settings
 except ImportError:
-    print("WiFi settings are kept in settings.py, please add them there!")
+    print("WiFi settings are kept in esp32spi_settings.py, please add them there!")
     raise
 
-
 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)
-
-requests.set_interface(esp)
-
-if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
-    print("ESP32 found and in idle mode")
-print("Firmware vers.", esp.firmware_version)
-print("MAC addr:", [hex(i) for i in esp.MAC_address])
-for ap in esp.scan_networks():
-    print("\t%s\t\tRSSI: %d" % (str(ap['ssid'], 'utf-8'), ap['rssi']))
-while not esp.is_connected:
-    try:
-        print("Connecting to AP...")
-        esp.connect_AP(bytes(settings['ssid'],'utf-8'), bytes(settings['password'],'utf-8'))
-    except (ValueError, RuntimeError) as e:
-        print("Failed to connect, retrying\n", e)
-        continue
-print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
-print("My IP address is", esp.pretty_ip(esp.ip_address))
-
+wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, settings, board.NEOPIXEL)
 
 counter = 0
 while True:
     try:
-        while not esp.is_connected:
-            # settings dictionary must contain 'ssid' and 'password' at a minimum
-            esp.connect_AP(bytes(settings['ssid'],'utf-8'), bytes(settings['password'],'utf-8'))
-        # great, lets get the data
         print("Posting data...", end='')
-        data=counter
-        feed='test'
-        payload={'value':data}
-        response=requests.post(
+        data = counter
+        feed = 'test'
+        payload = {'value':data}
+        response = wifi.post(
             "https://io.adafruit.com/api/v2/"+settings['aio_username']+"/feeds/"+feed+"/data",
             json=payload,headers={bytes("X-AIO-KEY","utf-8"):bytes(settings['aio_key'],"utf-8")})
         print(response.json())

examples/esp32spi_cheerlights.py

@@ -4,87 +4,53 @@
 from digitalio import DigitalInOut
 
 from adafruit_esp32spi import adafruit_esp32spi
-import adafruit_esp32spi.adafruit_esp32spi_requests as requests
+from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 
 import neopixel
 import adafruit_fancyled.adafruit_fancyled as fancy
 
-
-
 # Get wifi details and more from a settings.py file
 try:
     from esp32spi_settings import settings
 except ImportError:
-    print("WiFi settings are kept in settings.py, please add them there!")
+    print("WiFi settings are kept in esp32spi_settings.py, please add them there!")
     raise
 
-
-
 print("ESP32 SPI webclient test")
 
 DATA_SOURCE = "https://api.thingspeak.com/channels/1417/feeds.json?results=1"
 DATA_LOCATION = ["feeds", 0, "field2"]
 
-
 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)
-
-requests.set_interface(esp)
-
-if esp.status == adafruit_esp32spi.WL_IDLE_STATUS:
-    print("ESP32 found and in idle mode")
-print("Firmware vers.", esp.firmware_version)
-print("MAC addr:", [hex(i) for i in esp.MAC_address])
-for ap in esp.scan_networks():
-    print("\t%s\t\tRSSI: %d" % (str(ap['ssid'], 'utf-8'), ap['rssi']))
-while not esp.is_connected:
-    try:
-        print("Connecting to AP...")
-        esp.connect_AP(bytes(settings['ssid'],'utf-8'), bytes(settings['password'],'utf-8'))
-    except (ValueError, RuntimeError) as e:
-        print("Failed to connect, retrying\n", e)
-        continue
-print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
-print("My IP address is", esp.pretty_ip(esp.ip_address))
-
+wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, settings, board.NEOPIXEL)
 
 # neopixels
 pixels = neopixel.NeoPixel(board.A1, 16, brightness=0.3)
 pixels.fill(0)
-builtin = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.1)
-builtin[0] = 0
 
 # we'll save the value in question
 last_value = value = None
 the_time = None
 times = 0
 
-
 while True:
     try:
-        while not esp.is_connected:
-            builtin[0] = (100, 0, 0)
-            # settings dictionary must contain 'ssid' and 'password' at a minimum
-            esp.connect_AP(bytes(settings['ssid'],'utf-8'), bytes(settings['password'],'utf-8'))
-        builtin[0] = (0, 100, 0)
         print("Fetching json from", DATA_SOURCE)
-        builtin[0] = (100, 100, 0)
-        r = requests.get(DATA_SOURCE)
-        builtin[0] = (0, 0, 100)
-        print(r.json())
-        value=r.json()
-        for x in DATA_LOCATION:
-            value = value[x]
+        response = wifi.get(DATA_SOURCE)
+        print(response.json())
+        value=response.json()
+        for key in DATA_LOCATION:
+            value = value[key]
             print(value)
-        r.close()
+        response.close()
     except (ValueError, RuntimeError) as e:
         print("Failed to get data, retrying\n", e)
         continue
 
-    builtin[0] = (100, 100, 100)
     if not value:
         continue
     if last_value != value: