diff --git a/README.rst b/README.rst index 5118990..8fa0ecc 100644 --- a/README.rst +++ b/README.rst @@ -31,6 +31,8 @@ Dependencies This driver depends on: * `Adafruit CircuitPython `_ +* `Adafruit CircuitPython ConnectionManager `_ +* `Adafruit CircuitPython MiniMQTT `_ Please ensure all dependencies are available on the CircuitPython filesystem. This is easily achieved by downloading diff --git a/examples/aws_iot_shadows.py b/examples/aws_iot_shadows.py index a3c39bd..0d9f9c0 100644 --- a/examples/aws_iot_shadows.py +++ b/examples/aws_iot_shadows.py @@ -7,9 +7,9 @@ import busio from digitalio import DigitalInOut import neopixel +import adafruit_connection_manager from adafruit_esp32spi import adafruit_esp32spi from adafruit_esp32spi import adafruit_esp32spi_wifimanager -import adafruit_esp32spi.adafruit_esp32spi_socket as socket import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -134,11 +134,16 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -# Initialize MQTT interface with the esp interface -MQTT.set_socket(socket, esp) +pool = adafruit_connection_manager.get_radio_socketpool(esp) +ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp) # Set up a new MiniMQTT Client -client = MQTT.MQTT(broker=secrets["broker"], client_id=secrets["client_id"]) +client = MQTT.MQTT( + broker=secrets["broker"], + client_id=secrets["client_id"], + socket_pool=pool, + ssl_context=ssl_context, +) # Initialize AWS IoT MQTT API Client aws_iot = MQTT_CLIENT(client) diff --git a/examples/aws_iot_simpletest.py b/examples/aws_iot_simpletest.py index ce8ee26..66a224b 100644 --- a/examples/aws_iot_simpletest.py +++ b/examples/aws_iot_simpletest.py @@ -7,9 +7,9 @@ import busio from digitalio import DigitalInOut import neopixel +import adafruit_connection_manager from adafruit_esp32spi import adafruit_esp32spi from adafruit_esp32spi import adafruit_esp32spi_wifimanager -import adafruit_esp32spi.adafruit_esp32spi_socket as socket import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -131,11 +131,16 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -# Initialize MQTT interface with the esp interface -MQTT.set_socket(socket, esp) +pool = adafruit_connection_manager.get_radio_socketpool(esp) +ssl_context = adafruit_connection_manager.get_radio_ssl_context(esp) # Set up a new MiniMQTT Client -client = MQTT.MQTT(broker=secrets["broker"], client_id=secrets["client_id"]) +client = MQTT.MQTT( + broker=secrets["broker"], + client_id=secrets["client_id"], + socket_pool=pool, + ssl_context=ssl_context, +) # Initialize AWS IoT MQTT API Client aws_iot = MQTT_CLIENT(client) diff --git a/requirements.txt b/requirements.txt index 7a984a4..e743893 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka +adafruit-circuitpython-minimqtt