Skip to content

Commit 08e00bd

Browse files
dhalbertdhalbert
authored
Merge pull request #117 from justmobilize/update-legacy-set-socket-examples
Update legacy set_socket examples
2 parents 1a66da1 + 637b274 commit 08e00bd

17 files changed

+94
-60
lines changed

‎examples/adafruit_io_http/adafruit_io_analog_in.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import busio
99
from analogio import AnalogIn
1010
from digitalio import DigitalInOut
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
11+
import adafruit_connection_manager
12+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1213
from adafruit_esp32spi import adafruit_esp32spi
13-
import adafruit_requests as requests
14+
import adafruit_requests
1415
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
1516

1617
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -45,8 +46,9 @@
4546
continue
4647
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4748

48-
socket.set_interface(esp)
49-
requests.set_socket(socket, esp)
49+
# Initialize a requests session
50+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
51+
requests = adafruit_requests.Session(pool, ssl_context)
5052

5153
# Set your Adafruit IO Username and Key in secrets.py
5254
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_digital_out.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut, Direction
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
10+
import adafruit_connection_manager
11+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1112
from adafruit_esp32spi import adafruit_esp32spi
12-
import adafruit_requests as requests
13+
import adafruit_requests
1314
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
1415

1516
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -44,8 +45,9 @@
4445
continue
4546
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4647

47-
socket.set_interface(esp)
48-
requests.set_socket(socket, esp)
48+
# Initialize a requests session
49+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
50+
requests = adafruit_requests.Session(pool, ssl_context)
4951

5052
# Set your Adafruit IO Username and Key in secrets.py
5153
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_feeds.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
10+
import adafruit_connection_manager
11+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1112
from adafruit_esp32spi import adafruit_esp32spi
12-
import adafruit_requests as requests
13+
import adafruit_requests
1314
from adafruit_io.adafruit_io import IO_HTTP
1415

1516
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -44,8 +45,9 @@
4445
continue
4546
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4647

47-
socket.set_interface(esp)
48-
requests.set_socket(socket, esp)
48+
# Initialize a requests session
49+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
50+
requests = adafruit_requests.Session(pool, ssl_context)
4951

5052
# Set your Adafruit IO Username and Key in secrets.py
5153
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_groups.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
10+
import adafruit_connection_manager
11+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1112
from adafruit_esp32spi import adafruit_esp32spi
12-
import adafruit_requests as requests
13+
import adafruit_requests
1314
from adafruit_io.adafruit_io import IO_HTTP
1415

1516

@@ -45,8 +46,9 @@
4546
continue
4647
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4748

48-
socket.set_interface(esp)
49-
requests.set_socket(socket, esp)
49+
# Initialize a requests session
50+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
51+
requests = adafruit_requests.Session(pool, ssl_context)
5052

5153
# Set your Adafruit IO Username and Key in secrets.py
5254
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_metadata.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
9+
import adafruit_connection_manager
10+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1011
from adafruit_esp32spi import adafruit_esp32spi
11-
import adafruit_requests as requests
12+
import adafruit_requests
1213
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
1314

1415
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -43,8 +44,9 @@
4344
continue
4445
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4546

46-
socket.set_interface(esp)
47-
requests.set_socket(socket, esp)
47+
# Initialize a requests session
48+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
requests = adafruit_requests.Session(pool, ssl_context)
4850

4951
# Set your Adafruit IO Username and Key in secrets.py
5052
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_randomizer.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
10+
import adafruit_connection_manager
11+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1112
from adafruit_esp32spi import adafruit_esp32spi
12-
import adafruit_requests as requests
13+
import adafruit_requests
1314
from adafruit_io.adafruit_io import IO_HTTP
1415

1516
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -44,8 +45,9 @@
4445
continue
4546
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4647

47-
socket.set_interface(esp)
48-
requests.set_socket(socket, esp)
48+
# Initialize a requests session
49+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
50+
requests = adafruit_requests.Session(pool, ssl_context)
4951

5052
# Set your Adafruit IO Username and Key in secrets.py
5153
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_simpletest_esp32spi.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
9+
import adafruit_connection_manager
10+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1011
from adafruit_esp32spi import adafruit_esp32spi
11-
import adafruit_requests as requests
12+
import adafruit_requests
1213
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
1314

1415
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -43,8 +44,9 @@
4344
continue
4445
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4546

46-
socket.set_interface(esp)
47-
requests.set_socket(socket, esp)
47+
# Initialize a requests session
48+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
requests = adafruit_requests.Session(pool, ssl_context)
4850

4951
# Set your Adafruit IO Username and Key in secrets.py
5052
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_temperature.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut
10-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
10+
import adafruit_connection_manager
11+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1112
from adafruit_esp32spi import adafruit_esp32spi
12-
import adafruit_requests as requests
13+
import adafruit_requests
1314
import adafruit_adt7410
1415
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
1516

@@ -45,8 +46,9 @@
4546
continue
4647
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4748

48-
socket.set_interface(esp)
49-
requests.set_socket(socket, esp)
49+
# Initialize a requests session
50+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
51+
requests = adafruit_requests.Session(pool, ssl_context)
5052

5153
# Set your Adafruit IO Username and Key in secrets.py
5254
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_http/adafruit_io_weather.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
9+
import adafruit_connection_manager
10+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1011
from adafruit_esp32spi import adafruit_esp32spi
11-
import adafruit_requests as requests
12+
import adafruit_requests
1213
from adafruit_io.adafruit_io import IO_HTTP
1314

1415
# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
@@ -43,8 +44,9 @@
4344
continue
4445
print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
4546

46-
socket.set_interface(esp)
47-
requests.set_socket(socket, esp)
47+
# Initialize a requests session
48+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
49+
requests = adafruit_requests.Session(pool, ssl_context)
4850

4951
# Set your Adafruit IO Username and Key in secrets.py
5052
# (visit io.adafruit.com if you need to create an account,

‎examples/adafruit_io_mqtt/adafruit_io_feed_callback.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9+
import adafruit_connection_manager
910
from adafruit_esp32spi import adafruit_esp32spi
1011
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
12+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1213
import neopixel
1314
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1415
from adafruit_io.adafruit_io import IO_MQTT
@@ -94,15 +95,16 @@ def on_battery_msg(client, topic, message):
9495
wifi.connect()
9596
print("Connected!")
9697

97-
# Initialize MQTT interface with the esp interface
98-
MQTT.set_socket(socket, esp)
98+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
9999

100100
# Initialize a new MQTT Client object
101101
mqtt_client = MQTT.MQTT(
102102
broker="io.adafruit.com",
103103
port=1883,
104104
username=secrets["aio_username"],
105105
password=secrets["aio_key"],
106+
socket_pool=pool,
107+
ssl_context=ssl_context,
106108
)
107109

108110
# Initialize an Adafruit IO MQTT Client

‎examples/adafruit_io_mqtt/adafruit_io_groups.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
import board
1010
import busio
1111
from digitalio import DigitalInOut
12+
import adafruit_connection_manager
1213
from adafruit_esp32spi import adafruit_esp32spi
1314
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
14-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
15+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1516
import neopixel
1617
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1718
from adafruit_io.adafruit_io import IO_MQTT
@@ -85,15 +86,16 @@ def message(client, feed_id, payload):
8586
wifi.connect()
8687
print("Connected!")
8788

88-
# Initialize MQTT interface with the esp interface
89-
MQTT.set_socket(socket, esp)
89+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
9090

9191
# Initialize a new MQTT Client object
9292
mqtt_client = MQTT.MQTT(
9393
broker="io.adafruit.com",
9494
port=1883,
9595
username=secrets["aio_username"],
9696
password=secrets["aio_key"],
97+
socket_pool=pool,
98+
ssl_context=ssl_context,
9799
)
98100

99101
# Initialize an Adafruit IO MQTT Client

‎examples/adafruit_io_mqtt/adafruit_io_location.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import board
88
import busio
99
from digitalio import DigitalInOut
10+
import adafruit_connection_manager
1011
from adafruit_esp32spi import adafruit_esp32spi
1112
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
12-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
13+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1314
import neopixel
1415

1516

@@ -85,15 +86,16 @@ def message(client, feed_id, payload):
8586
wifi.connect()
8687
print("Connected!")
8788

88-
# Initialize MQTT interface with the esp interface
89-
MQTT.set_socket(socket, esp)
89+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
9090

9191
# Initialize a new MQTT Client object
9292
mqtt_client = MQTT.MQTT(
9393
broker="io.adafruit.com",
9494
port=1883,
9595
username=secrets["aio_username"],
9696
password=secrets["aio_key"],
97+
socket_pool=pool,
98+
ssl_context=ssl_context,
9799
)
98100

99101
# Initialize an Adafruit IO MQTT Client

‎examples/adafruit_io_mqtt/adafruit_io_pubsub_rp2040.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import board
77
import busio
88
from digitalio import DigitalInOut
9+
import adafruit_connection_manager
910
from adafruit_esp32spi import adafruit_esp32spi
1011
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
11-
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
12+
import adafruit_esp32spi.adafruit_esp32spi_socket as pool
1213
import adafruit_minimqtt.adafruit_minimqtt as MQTT
1314
from adafruit_io.adafruit_io import IO_MQTT
1415

@@ -70,15 +71,16 @@ def on_led_msg(client, topic, message):
7071
wifi.connect()
7172
print("Connected!")
7273

73-
# Initialize MQTT interface with the esp interface
74-
MQTT.set_socket(socket, esp)
74+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, esp)
7575

7676
# Initialize a new MQTT Client object
7777
mqtt_client = MQTT.MQTT(
7878
broker="io.adafruit.com",
7979
port=1883,
8080
username=secrets["aio_username"],
8181
password=secrets["aio_key"],
82+
socket_pool=pool,
83+
ssl_context=ssl_context,
8284
)
8385

8486
# Initialize an Adafruit IO MQTT Client

‎examples/adafruit_io_mqtt/adafruit_io_simpletest_cellular.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
import busio
1313
import digitalio
1414

15+
import adafruit_connection_manager
1516
from adafruit_fona.adafruit_fona import FONA
1617
from adafruit_fona.adafruit_fona_gsm import GSM
17-
import adafruit_fona.adafruit_fona_socket as cellular_socket
18+
import adafruit_fona.adafruit_fona_socket as pool
1819

1920
import adafruit_minimqtt.adafruit_minimqtt as MQTT
2021
from adafruit_io.adafruit_io import IO_MQTT
@@ -82,15 +83,16 @@ def message(client, feed_id, payload):
8283
print("Feed {0} received new value: {1}".format(feed_id, payload))
8384

8485

85-
# Initialize MQTT interface with the ethernet interface
86-
MQTT.set_socket(cellular_socket, fona)
86+
ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, fona)
8787

8888
# Initialize a new MQTT Client object
8989
mqtt_client = MQTT.MQTT(
9090
broker="io.adafruit.com",
9191
port=1883,
9292
username=secrets["aio_username"],
9393
password=secrets["aio_key"],
94+
socket_pool=pool,
95+
ssl_context=ssl_context,
9496
)
9597

9698
# Initialize an Adafruit IO MQTT Client

0 commit comments

Comments
 (0)