From 5fcf6cc7dfaf92b0dad51ad7b8f8094881ae7cdd Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Thu, 29 Feb 2024 11:35:47 -0800 Subject: [PATCH 1/3] Fix README requirements --- README.rst | 2 ++ requirements.txt | 1 + 2 files changed, 3 insertions(+) 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/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 From 2de1fa6b6d08647a7e6cd17f68069797038bedc1 Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Thu, 29 Feb 2024 21:16:55 -0800 Subject: [PATCH 2/3] Update legacy set_socket examples --- examples/aws_iot_shadows.py | 13 +++++++++---- examples/aws_iot_simpletest.py | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/examples/aws_iot_shadows.py b/examples/aws_iot_shadows.py index a3c39bd..0836904 100644 --- a/examples/aws_iot_shadows.py +++ b/examples/aws_iot_shadows.py @@ -7,9 +7,10 @@ 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_esp32spi.adafruit_esp32spi_socket as pool import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -134,11 +135,15 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -# Initialize MQTT interface with the esp interface -MQTT.set_socket(socket, esp) +ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, 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..e79a56f 100644 --- a/examples/aws_iot_simpletest.py +++ b/examples/aws_iot_simpletest.py @@ -7,9 +7,10 @@ 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_esp32spi.adafruit_esp32spi_socket as pool import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -131,11 +132,15 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -# Initialize MQTT interface with the esp interface -MQTT.set_socket(socket, esp) +ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, 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) From 21964b97b57668b39bfb5cff26b1b2ba84093204 Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Fri, 1 Mar 2024 08:48:18 -0800 Subject: [PATCH 3/3] Fix get_radio_ssl_context --- examples/aws_iot_shadows.py | 4 ++-- examples/aws_iot_simpletest.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/aws_iot_shadows.py b/examples/aws_iot_shadows.py index 0836904..0d9f9c0 100644 --- a/examples/aws_iot_shadows.py +++ b/examples/aws_iot_shadows.py @@ -10,7 +10,6 @@ import adafruit_connection_manager from adafruit_esp32spi import adafruit_esp32spi from adafruit_esp32spi import adafruit_esp32spi_wifimanager -import adafruit_esp32spi.adafruit_esp32spi_socket as pool import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -135,7 +134,8 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, 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( diff --git a/examples/aws_iot_simpletest.py b/examples/aws_iot_simpletest.py index e79a56f..66a224b 100644 --- a/examples/aws_iot_simpletest.py +++ b/examples/aws_iot_simpletest.py @@ -10,7 +10,6 @@ import adafruit_connection_manager from adafruit_esp32spi import adafruit_esp32spi from adafruit_esp32spi import adafruit_esp32spi_wifimanager -import adafruit_esp32spi.adafruit_esp32spi_socket as pool import adafruit_minimqtt.adafruit_minimqtt as MQTT from adafruit_aws_iot import MQTT_CLIENT @@ -132,7 +131,8 @@ def message(client, topic, msg): wifi.connect() print("Connected!") -ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, 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(