Skip to content

Commit 6d928e4

Browse files
author
brentru
committed
drop esp32spi object in favor of wifimanager, update all examples
1 parent e7ed0fa commit 6d928e4

File tree

5 files changed

+71
-61
lines changed

5 files changed

+71
-61
lines changed

adafruit_minimqtt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def __init__(self, socket, broker, port=None, username=None,
9898
# network management
9999
self._socket = socket
100100
network_manager_type = str(type(network_manager))
101-
if ('ESPSPI_WiFiManager' in network_manager_type):
101+
if 'ESPSPI_WiFiManager' in network_manager_type:
102102
self._wifi = network_manager
103103
else:
104104
raise TypeError("This library requires a NetworkManager object.")

examples/minimqtt_adafruitio_wifi.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import time
22
import board
33
import busio
4+
import neopixel
45
from digitalio import DigitalInOut
56
from adafruit_esp32spi import adafruit_esp32spi
7+
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
68
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
79
from adafruit_minimqtt import MQTT
810

@@ -27,6 +29,18 @@
2729

2830
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2931
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
32+
"""Use below for Most Boards"""
33+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
34+
"""Uncomment below for ItsyBitsy M4"""
35+
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
36+
# Uncomment below for an externally defined RGB LED
37+
# import adafruit_rgbled
38+
# from adafruit_esp32spi import PWMOut
39+
# RED_LED = PWMOut.PWMOut(esp, 26)
40+
# GREEN_LED = PWMOut.PWMOut(esp, 27)
41+
# BLUE_LED = PWMOut.PWMOut(esp, 25)
42+
# status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
43+
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3044

3145
### Adafruit IO Setup ###
3246

@@ -38,32 +52,21 @@
3852

3953
### Code ###
4054

41-
def connect_wifi():
42-
print("Connecting to %s..."%secrets['ssid'])
43-
while not esp.is_connected:
44-
try:
45-
esp.connect_AP(secrets['ssid'], secrets['password'])
46-
except RuntimeError as e:
47-
print("could not connect to AP, retrying: ",e)
48-
continue
49-
print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
50-
print("IP: ", esp.pretty_ip(esp.ip_address))
51-
5255
# pylint: disable=unused-argument
5356
def on_message(client, topic, message):
5457
# This method is called whenever a new message is received
5558
# from the server.
5659
print('New message on topic {0}: {1}'.format(topic, message))
5760

5861
# Connect to WiFi
59-
connect_wifi()
62+
wifi.connect()
6063

6164
# Set up a MiniMQTT Client
6265
mqtt_client = MQTT(socket,
6366
broker = secrets['broker'],
6467
username = secrets['user'],
6568
password = secrets['pass'],
66-
esp = esp)
69+
network_manager = wifi)
6770

6871
# Attach on_message method to the MQTT Client
6972
mqtt_client.on_message = on_message

examples/minimqtt_pub_sub_blocking.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
# Adafruit IO SSL/TLS Example for WiFi (ESP32SPI)
33
import board
44
import busio
5+
import neopixel
56
from digitalio import DigitalInOut
67
from adafruit_esp32spi import adafruit_esp32spi
8+
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
79
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
810
from adafruit_minimqtt import MQTT
911

@@ -28,6 +30,18 @@
2830

2931
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
3032
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
33+
"""Use below for Most Boards"""
34+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
35+
"""Uncomment below for ItsyBitsy M4"""
36+
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
37+
# Uncomment below for an externally defined RGB LED
38+
# import adafruit_rgbled
39+
# from adafruit_esp32spi import PWMOut
40+
# RED_LED = PWMOut.PWMOut(esp, 26)
41+
# GREEN_LED = PWMOut.PWMOut(esp, 27)
42+
# BLUE_LED = PWMOut.PWMOut(esp, 25)
43+
# status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
44+
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3145

3246
### Adafruit IO Setup ###
3347

@@ -36,17 +50,6 @@
3650

3751
### Code ###
3852

39-
def connect_wifi():
40-
print("Connecting to %s..."%secrets['ssid'])
41-
while not esp.is_connected:
42-
try:
43-
esp.connect_AP(secrets['ssid'], secrets['password'])
44-
except RuntimeError as e:
45-
print("could not connect to AP, retrying: ",e)
46-
continue
47-
print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
48-
print("IP: ", esp.pretty_ip(esp.ip_address))
49-
5053
# Define callback methods which are called when events occur
5154
# pylint: disable=unused-argument, redefined-outer-name
5255
def connected(client, userdata, flags, rc):
@@ -69,14 +72,14 @@ def message(client, topic, message):
6972
print('New message on topic {0}: {1}'.format(topic, message))
7073

7174
# Connect to WiFi
72-
connect_wifi()
75+
wifi.connect()
7376

74-
# Initialize a MiniMQTT Client
77+
# Set up a MiniMQTT Client
7578
mqtt_client = MQTT(socket,
7679
broker = secrets['broker'],
7780
username = secrets['user'],
7881
password = secrets['pass'],
79-
esp = esp)
82+
network_manager = wifi)
8083

8184
# Setup the callback methods above
8285
mqtt_client.on_connect = connected

examples/minimqtt_pub_sub_nonblocking.py

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import time
22
import board
33
import busio
4+
import neopixel
45
from digitalio import DigitalInOut
56
from adafruit_esp32spi import adafruit_esp32spi
7+
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
68
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
79
from adafruit_minimqtt import MQTT
810

@@ -27,25 +29,25 @@
2729

2830
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2931
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
32+
"""Use below for Most Boards"""
33+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
34+
"""Uncomment below for ItsyBitsy M4"""
35+
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
36+
# Uncomment below for an externally defined RGB LED
37+
# import adafruit_rgbled
38+
# from adafruit_esp32spi import PWMOut
39+
# RED_LED = PWMOut.PWMOut(esp, 26)
40+
# GREEN_LED = PWMOut.PWMOut(esp, 27)
41+
# BLUE_LED = PWMOut.PWMOut(esp, 25)
42+
# status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
43+
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3044

3145
### Adafruit IO Setup ###
3246

3347
# Setup a feed named `testfeed` for publishing.
3448
default_topic = secrets['user']+'/feeds/testfeed'
3549

3650
### Code ###
37-
38-
def connect_wifi():
39-
print("Connecting to %s..."%secrets['ssid'])
40-
while not esp.is_connected:
41-
try:
42-
esp.connect_AP(secrets['ssid'], secrets['password'])
43-
except RuntimeError as e:
44-
print("could not connect to AP, retrying: ",e)
45-
continue
46-
print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
47-
print("IP: ", esp.pretty_ip(esp.ip_address))
48-
4951
# Define callback methods which are called when events occur
5052
# pylint: disable=unused-argument, redefined-outer-name
5153
def connected(client, userdata, flags, rc):
@@ -68,14 +70,14 @@ def message(client, topic, message):
6870
print('New message on topic {0}: {1}'.format(topic, message))
6971

7072
# Connect to WiFi
71-
connect_wifi()
73+
wifi.connect()
7274

73-
# Initialize a MiniMQTT Client
75+
# Set up a MiniMQTT Client
7476
mqtt_client = MQTT(socket,
7577
broker = secrets['broker'],
7678
username = secrets['user'],
7779
password = secrets['pass'],
78-
esp = esp)
80+
network_manager = wifi)
7981

8082
# Setup the callback methods above
8183
mqtt_client.on_connect = connected

examples/minimqtt_simpletest.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import board
22
import busio
3+
import neopixel
34
from digitalio import DigitalInOut
45
from adafruit_esp32spi import adafruit_esp32spi
6+
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
57
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
68

79
from adafruit_minimqtt import MQTT
@@ -27,6 +29,18 @@
2729

2830
spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
2931
esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
32+
"""Use below for Most Boards"""
33+
status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2) # Uncomment for Most Boards
34+
"""Uncomment below for ItsyBitsy M4"""
35+
# status_light = dotstar.DotStar(board.APA102_SCK, board.APA102_MOSI, 1, brightness=0.2)
36+
# Uncomment below for an externally defined RGB LED
37+
# import adafruit_rgbled
38+
# from adafruit_esp32spi import PWMOut
39+
# RED_LED = PWMOut.PWMOut(esp, 26)
40+
# GREEN_LED = PWMOut.PWMOut(esp, 27)
41+
# BLUE_LED = PWMOut.PWMOut(esp, 25)
42+
# status_light = adafruit_rgbled.RGBLED(RED_LED, BLUE_LED, GREEN_LED)
43+
wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
3044

3145
### Topic Setup ###
3246

@@ -40,18 +54,6 @@
4054

4155
### Code ###
4256

43-
def connect_wifi():
44-
# Connects the ESP32 to WiFi
45-
print("Connecting to %s..."%secrets['ssid'])
46-
while not esp.is_connected:
47-
try:
48-
esp.connect_AP(secrets['ssid'], secrets['password'])
49-
except RuntimeError as e:
50-
print("could not connect to AP, retrying: ",e)
51-
continue
52-
print("Connected to", str(esp.ssid, 'utf-8'), "\tRSSI:", esp.rssi)
53-
print("IP: ", esp.pretty_ip(esp.ip_address))
54-
5557
# Define callback methods which are called when events occur
5658
# pylint: disable=unused-argument, redefined-outer-name
5759
def connect(client, userdata, flags, rc):
@@ -78,14 +80,14 @@ def publish(client, userdata, topic, pid):
7880
print('Published to {0} with PID {1}'.format(topic, pid))
7981

8082
# Connect to WiFi
81-
connect_wifi()
83+
wifi.connect()
8284

8385
# Set up a MiniMQTT Client
84-
client = MQTT(socket,
85-
broker = secrets['broker'],
86-
username = secrets['user'],
87-
password = secrets['pass'],
88-
esp = esp)
86+
client = MQTT(socket,
87+
broker = secrets['broker'],
88+
username = secrets['user'],
89+
password = secrets['pass'],
90+
network_manager = wifi)
8991

9092
# Connect callback handlers to client
9193
client.on_connect = connect

0 commit comments

Comments
 (0)