Skip to content

Commit

Permalink
Merge pull request #206 from justmobilize/fix-get-radio-ssl-context
Browse files Browse the repository at this point in the history
Fix get_radio_ssl_context
  • Loading branch information
dhalbert authored Mar 1, 2024
2 parents 5462177 + 112b25b commit 048d9c0
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions examples/esp32spi/minimqtt_adafruitio_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import neopixel
import adafruit_connection_manager
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_socket as pool

import adafruit_minimqtt.adafruit_minimqtt as MQTT

Expand Down Expand Up @@ -83,7 +82,8 @@ def message(client, topic, message):
esp.connect_AP(os.getenv("CIRCUITPY_WIFI_SSID"), os.getenv("CIRCUITPY_WIFI_PASSWORD"))
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 MiniMQTT Client
mqtt_client = MQTT.MQTT(
Expand Down
4 changes: 2 additions & 2 deletions examples/esp32spi/minimqtt_certificate_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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

Expand Down Expand Up @@ -111,7 +110,8 @@ def publish(client, userdata, topic, pid):
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 MiniMQTT Client
client = MQTT.MQTT(
Expand Down
4 changes: 2 additions & 2 deletions examples/esp32spi/minimqtt_pub_sub_blocking_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import neopixel
import adafruit_connection_manager
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_socket as pool

import adafruit_minimqtt.adafruit_minimqtt as MQTT

Expand Down Expand Up @@ -83,7 +82,8 @@ def message(client, topic, message):
esp.connect_AP(os.getenv("CIRCUITPY_WIFI_SSID"), os.getenv("CIRCUITPY_WIFI_PASSWORD"))
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 MiniMQTT Client
mqtt_client = MQTT.MQTT(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -93,7 +92,8 @@ def on_message(client, topic, message):
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 MiniMQTT Client
client = MQTT.MQTT(
Expand Down
4 changes: 2 additions & 2 deletions examples/esp32spi/minimqtt_pub_sub_nonblocking_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import neopixel
import adafruit_connection_manager
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_socket as pool

import adafruit_minimqtt.adafruit_minimqtt as MQTT

Expand Down Expand Up @@ -82,7 +81,8 @@ def message(client, topic, message):
esp.connect_AP(os.getenv("CIRCUITPY_WIFI_SSID"), os.getenv("CIRCUITPY_WIFI_PASSWORD"))
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 MiniMQTT Client
mqtt_client = MQTT.MQTT(
Expand Down
6 changes: 3 additions & 3 deletions examples/esp32spi/minimqtt_pub_sub_pyportal_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
import time
import adafruit_connection_manager
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
import adafruit_pyportal

import adafruit_minimqtt.adafruit_minimqtt as MQTT
Expand Down Expand Up @@ -52,8 +51,9 @@ def message(client, topic, message):
print("Connected!")

# pylint: disable=protected-access
ssl_context = adafruit_connection_manager.create_fake_ssl_context(
pool, pyportal.network._wifi.esp
pool = adafruit_connection_manager.get_radio_socketpool(pyportal.network._wifi.esp)
ssl_context = adafruit_connection_manager.get_radio_ssl_context(
pyportal.network._wifi.esp
)

# Set up a MiniMQTT Client
Expand Down
4 changes: 2 additions & 2 deletions examples/esp32spi/minimqtt_simpletest_esp32spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from digitalio import DigitalInOut
import adafruit_connection_manager
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
import adafruit_minimqtt.adafruit_minimqtt as MQTT

# Add settings.toml to your filesystem CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD keys
Expand Down Expand Up @@ -86,7 +85,8 @@ def message(client, topic, message):
print("New message on topic {0}: {1}".format(topic, message))


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 MiniMQTT Client
mqtt_client = MQTT.MQTT(
Expand Down
4 changes: 2 additions & 2 deletions examples/ethernet/minimqtt_adafruitio_eth.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from digitalio import DigitalInOut
import adafruit_connection_manager
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool

import adafruit_minimqtt.adafruit_minimqtt as MQTT

Expand Down Expand Up @@ -56,7 +55,8 @@ def message(client, topic, message):
print("New message on topic {0}: {1}".format(topic, message))


ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
pool = adafruit_connection_manager.get_radio_socketpool(eth)
ssl_context = adafruit_connection_manager.get_radio_ssl_context(eth)

# Set up a MiniMQTT Client
# NOTE: We'll need to connect insecurely for ethernet configurations.
Expand Down
4 changes: 2 additions & 2 deletions examples/ethernet/minimqtt_simpletest_eth.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from digitalio import DigitalInOut
import adafruit_connection_manager
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
import adafruit_wiznet5k.adafruit_wiznet5k_socket as pool

import adafruit_minimqtt.adafruit_minimqtt as MQTT

Expand Down Expand Up @@ -65,7 +64,8 @@ def publish(client, userdata, topic, pid):
print("Published to {0} with PID {1}".format(topic, pid))


ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, eth)
pool = adafruit_connection_manager.get_radio_socketpool(eth)
ssl_context = adafruit_connection_manager.get_radio_ssl_context(eth)

# Set up a MiniMQTT Client
# NOTE: We'll need to connect insecurely for ethernet configurations.
Expand Down
4 changes: 2 additions & 2 deletions examples/minimqtt_simpletest.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from digitalio import DigitalInOut
import adafruit_connection_manager
from adafruit_esp32spi import adafruit_esp32spi
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
import adafruit_minimqtt.adafruit_minimqtt as MQTT

# Add settings.toml to your filesystem CIRCUITPY_WIFI_SSID and CIRCUITPY_WIFI_PASSWORD keys
Expand Down Expand Up @@ -89,7 +88,8 @@ def message(client, topic, message):
print("New message on topic {0}: {1}".format(topic, message))


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 MiniMQTT Client
mqtt_client = MQTT.MQTT(
Expand Down

0 comments on commit 048d9c0

Please sign in to comment.