lint all the examples, update ALL the examples!

Author: brentru

examples/minimqtt_adafruitio_wifi.py

@@ -111,4 +111,4 @@ def message(client, topic, message):
     mqtt_client.publish(photocell_feed, photocell_val)
     print('Sent!')
     photocell_val += 1
-    time.sleep(5)
+    time.sleep(5)

examples/minimqtt_certificate.py

@@ -6,7 +6,7 @@
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 
-from adafruit_minimqtt import MQTT
+import adafruit_minimqtt as MQTT
 
 ### WiFi ###
 
@@ -93,14 +93,17 @@ def publish(client, userdata, topic, pid):
 esp.set_private_key(DEVICE_KEY)
 
 # Connect to WiFi
+print("Connecting to WiFi...")
 wifi.connect()
+print("Connected!")
+
+# Initialize MQTT interface with the esp interface
+MQTT.set_socket(socket, esp)
 
 # Set up a MiniMQTT Client
-client =  MQTT(socket,
-               broker = secrets['broker'],
-               username = secrets['user'],
-               password = secrets['pass'],
-               network_manager = wifi)
+client =  MQTT.MQTT(broker = secrets['broker'],
+                    username = secrets['user'],
+                    password = secrets['pass'])
 
 # Connect callback handlers to client
 client.on_connect = connect

examples/minimqtt_pub_sub_blocking.py

@@ -1,13 +1,13 @@
 # CircuitPython MiniMQTT Library
-# Adafruit IO SSL/TLS Example for WiFi (ESP32SPI)
+# Adafruit IO SSL/TLS Example for WiFi
 import board
 import busio
 from digitalio import DigitalInOut
 import neopixel
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_minimqtt import MQTT
+import adafruit_minimqtt as MQTT
 
 ### WiFi ###
 
@@ -72,21 +72,25 @@ def message(client, topic, message):
     print('New message on topic {0}: {1}'.format(topic, message))
 
 # Connect to WiFi
+print("Connecting to WiFi...")
 wifi.connect()
+print("Connected!")
+
+# Initialize MQTT interface with the esp interface
+MQTT.set_socket(socket, esp)
 
 # Set up a MiniMQTT Client
-mqtt_client = MQTT(socket,
-                   broker = secrets['broker'],
-                   username = secrets['user'],
-                   password = secrets['pass'],
-                   network_manager = wifi)
+mqtt_client = MQTT.MQTT(broker = secrets['broker'],
+                        username = secrets['user'],
+                        password = secrets['pass'])
 
 # Setup the callback methods above
 mqtt_client.on_connect = connected
 mqtt_client.on_disconnect = disconnected
 mqtt_client.on_message = message
 
 # Connect the client to the MQTT broker.
+print('Connecting to MQTT broker...')
 mqtt_client.connect()
 
 # Start a blocking message loop

examples/minimqtt_pub_sub_nonblocking.py

@@ -6,7 +6,7 @@
 from adafruit_esp32spi import adafruit_esp32spi
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
-from adafruit_minimqtt import MQTT
+import adafruit_minimqtt as MQTT
 
 ### WiFi ###
 
@@ -70,14 +70,17 @@ def message(client, topic, message):
     print('New message on topic {0}: {1}'.format(topic, message))
 
 # Connect to WiFi
+print("Connecting to WiFi...")
 wifi.connect()
+print("Connected!")
+
+# Initialize MQTT interface with the esp interface
+MQTT.set_socket(socket, esp)
 
 # Set up a MiniMQTT Client
-mqtt_client = MQTT(socket,
-                   broker = secrets['broker'],
-                   username = secrets['user'],
-                   password = secrets['pass'],
-                   network_manager = wifi)
+mqtt_client = MQTT.MQTT(broker = secrets['broker'],
+                        username = secrets['user'],
+                        password = secrets['pass'])
 
 # Setup the callback methods above
 mqtt_client.on_connect = connected

examples/minimqtt_simpletest.py

@@ -6,7 +6,7 @@
 from adafruit_esp32spi import adafruit_esp32spi_wifimanager
 import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 
-from adafruit_minimqtt import MQTT
+import adafruit_minimqtt as MQTT
 
 ### WiFi ###
 
@@ -80,14 +80,17 @@ def publish(client, userdata, topic, pid):
     print('Published to {0} with PID {1}'.format(topic, pid))
 
 # Connect to WiFi
+print("Connecting to WiFi...")
 wifi.connect()
+print("Connected!")
+
+# Initialize MQTT interface with the esp interface
+MQTT.set_socket(socket, esp)
 
 # Set up a MiniMQTT Client
-client =  MQTT(socket,
-               broker = secrets['broker'],
-               username = secrets['user'],
-               password = secrets['pass'],
-               network_manager = wifi)
+client =  MQTT.MQTT(broker = secrets['broker'],
+                    username = secrets['user'],
+                    password = secrets['pass'])
 
 # Connect callback handlers to client
 client.on_connect = connect