Merge branch 'main' of https://github.com/adafruit/Adafruit_CircuitPython_PortalBase into feature/fix_SPI_error

slootsky · slootsky · commit 14b81dc0ffcc · 2021-04-26T16:58:10.000-04:00
# Conflicts:
#	adafruit_portalbase/wifi_coprocessor.py
diff --git a/adafruit_portalbase/wifi_coprocessor.py b/adafruit_portalbase/wifi_coprocessor.py
@@ -63,7 +63,6 @@ def __init__(self, *, status_led=None, esp=None, external_spi=None):
                 spi = external_spi
             else:  # Else: Make ESP32 connection
                 spi = board.SPI()
-                  
 
             self.esp = adafruit_esp32spi.ESP_SPIcontrol(
                 spi, esp32_cs, esp32_ready, esp32_reset, esp32_gpio0
diff --git a/requirements.txt b/requirements.txt
@@ -12,3 +12,4 @@ adafruit-circuitpython-requests
 adafruit-circuitpython-adafruitio
 adafruit-circuitpython-simpleio
 adafruit-circuitpython-fakerequests
+adafruit-circuitpython-miniqr
