Skip to content

Commit e7ed0fa

Browse files
author
brentru
committed
esp32spi -> networkmanager object instead
1 parent 1177631 commit e7ed0fa

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

adafruit_minimqtt.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,24 @@ class MQTT:
8787
:param int port: Optional port definition, defaults to 8883.
8888
:param str username: Username for broker authentication.
8989
:param str password: Password for broker authentication.
90-
:param ESP_SPIcontrol esp: An ESP network interface object.
90+
:param network_manager: NetworkManager object, such as WiFiManager from ESPSPI_WiFiManager.
9191
:param str client_id: Optional client identifier, defaults to a unique, generated string.
9292
:param bool is_ssl: Sets a secure or insecure connection with the broker.
9393
:param bool log: Attaches a logger to the MQTT client, defaults to logging level INFO.
9494
"""
9595
# pylint: disable=too-many-arguments,too-many-instance-attributes, not-callable, invalid-name, no-member
9696
def __init__(self, socket, broker, port=None, username=None,
97-
password=None, esp=None, client_id=None, is_ssl=True, log=False):
98-
# network interface
97+
password=None, network_manager=None, client_id=None, is_ssl=True, log=False):
98+
# network management
9999
self._socket = socket
100-
if esp is not None:
101-
if hasattr(esp, '_gpio0'):
102-
self._esp = esp
103-
else:
104-
raise MMQTTException('Invalid ESP32SPI object provided.')
100+
network_manager_type = str(type(network_manager))
101+
if ('ESPSPI_WiFiManager' in network_manager_type):
102+
self._wifi = network_manager
105103
else:
106-
raise NotImplementedError('MiniMQTT currently supports an ESP32SPI network interface.')
104+
raise TypeError("This library requires a NetworkManager object.")
107105
# broker
108106
try: # set broker IP
109-
self.broker = self._esp.unpretty_ip(broker)
107+
self.broker = self._wifi.esp.unpretty_ip(broker)
110108
except ValueError: # set broker URL
111109
self.broker = broker
112110
# port/ssl
@@ -648,10 +646,10 @@ def _set_interface(self):
648646
The network hardware must be set in init
649647
prior to calling this method.
650648
"""
651-
if self._esp:
652-
self._socket.set_interface(self._esp)
649+
if self._wifi:
650+
self._socket.set_interface(self._wifi.esp)
653651
else:
654-
raise TypeError('network interface required.')
652+
raise TypeError('Network Manager Required.')
655653

656654
def is_connected(self):
657655
"""Returns MQTT client session status as True if connected, raises

0 commit comments

Comments
 (0)