pylint and rename all mqtt examples, drop mqtt prefix as they're in the mqtt folder already

Author: brentru

examples/mqtt/adafruit_io_groups.py

@@ -3,11 +3,12 @@
 import time
 from random import randint
 
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 import board
 import busio
 import neopixel
-from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
+from adafruit_esp32spi import adafruit_esp32spi
+from adafruit_esp32spi import adafruit_esp32spi_wifimanager
+import adafruit_esp32spi.adafruit_esp32spi_socket as socket
 from adafruit_io.adafruit_io import IO_MQTT
 from adafruit_minimqtt import MQTT
 from digitalio import DigitalInOut
@@ -50,6 +51,7 @@
 
 
 # Define callback functions which will be called when certain events happen.
+# pylint: disable=unused-argument
 def connected(client):
     # Connected function will be called when the client is connected to Adafruit IO.
     # This is a good place to subscribe to feed changes.  The client parameter
@@ -60,12 +62,12 @@ def connected(client):
     # Subscribe to Group
     io.subscribe(group_key=group_name)
 
-
+# pylint: disable=unused-argument
 def disconnected(client):
     # Disconnected function will be called when the client disconnects.
     print("Disconnected from Adafruit IO!")
 
-
+# pylint: disable=unused-argument
 def message(client, feed_id, payload):
     # Message function will be called when a subscribed feed has a new value.
     # The feed_id parameter identifies the feed, and the payload parameter has
@@ -77,7 +79,7 @@ def message(client, feed_id, payload):
 wifi.connect()
 
 # Initialize a new MQTT Client object
-client = MQTT(
+mqtt_client = MQTT(
     socket=socket,
     broker="io.adafruit.com",
     username=secrets["aio_user"],
@@ -86,7 +88,7 @@ def message(client, feed_id, payload):
 )
 
 # Initialize an Adafruit IO MQTT Client
-io = IO_MQTT(client)
+io = IO_MQTT(mqtt_client)
 
 # Connect the callback methods defined above to Adafruit IO
 io.on_connect = connected
@@ -97,8 +99,8 @@ def message(client, feed_id, payload):
 group_name = "weatherstation"
 
 # Feeds within the group
-temp_feed = "brubell/feeds/weatherstation.temperature"
-humid_feed = "brubell/feeds/weatherstation.humidity"
+temp_feed = "weatherstation.temperature"
+humid_feed = "weatherstation.humidity"
 
 # Connect to Adafruit IO
 io.connect()
@@ -109,9 +111,9 @@ def message(client, feed_id, payload):
     io.loop()
     temp_reading = randint(0, 100)
     print("Publishing value {0} to feed: {1}".format(temp_reading, temp_feed))
-    client.publish(temp_feed, temp_reading)
+    io.publish(temp_feed, temp_reading)
 
     humid_reading = randint(0, 100)
     print("Publishing value {0} to feed: {1}".format(humid_reading, humid_feed))
-    client.publish(humid_feed, humid_reading)
+    io.publish(humid_feed, humid_reading)
     time.sleep(5)

examples/mqtt/adafruit_io_mqtt_location.py renamed to examples/mqtt/adafruit_io_location.py

@@ -1,7 +1,6 @@
 # Example of tagging data with location values
 # and sending it to an Adafruit IO feed.
 
-from random import randint
 import board
 import neopixel
 import busio
@@ -50,22 +49,23 @@
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
 # Define callback functions which will be called when certain events happen.
+# pylint: disable=unused-argument
 def connected(client):
     # Connected function will be called when the client is connected to Adafruit IO.
     # This is a good place to subscribe to feed changes.  The client parameter
     # passed to this function is the Adafruit IO MQTT client so you can make
     # calls against it easily.
     print("Connected to Adafruit IO!")
 
-    # Subscribe to a location feed!
+    # Subscribe to a feed named location
     io.subscribe("location")
 
-
+# pylint: disable=unused-argument
 def disconnected(client):
     # Disconnected function will be called when the client disconnects.
     print("Disconnected from Adafruit IO!")
 
-
+# pylint: disable=unused-argument
 def message(client, feed_id, payload):
     # Message function will be called when a subscribed feed has a new value.
     # The feed_id parameter identifies the feed, and the payload parameter has
@@ -77,7 +77,7 @@ def message(client, feed_id, payload):
 wifi.connect()
 
 # Initialize a new MQTT Client object
-client = MQTT(
+mqtt_client = MQTT(
     socket=socket,
     broker="io.adafruit.com",
     username=secrets["aio_user"],
@@ -87,7 +87,7 @@ def message(client, feed_id, payload):
 )
 
 # Initialize an Adafruit IO MQTT Client
-io = IO_MQTT(client)
+io = IO_MQTT(mqtt_client)
 
 # Connect the callback methods defined above to Adafruit IO
 io.on_connect = connected

examples/mqtt/adafruit_io_mqtt_simpletest.py renamed to examples/mqtt/adafruit_io_simpletest.py

@@ -6,16 +6,17 @@
 # Modified by Brent Rubell for Adafruit Industries, 2019
 import time
 from random import randint
+
+
 import board
-import neopixel
 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
 from adafruit_io.adafruit_io import IO_MQTT
+from adafruit_minimqtt import MQTT
+from digitalio import DigitalInOut
 
 ### WiFi ###
 
@@ -54,6 +55,7 @@
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
 # Define callback functions which will be called when certain events happen.
+# pylint: disable=unused-argument
 def connected(client):
     # Connected function will be called when the client is connected to Adafruit IO.
     # This is a good place to subscribe to feed changes.  The client parameter
@@ -63,12 +65,12 @@ def connected(client):
     # Subscribe to changes on a feed named DemoFeed.
     client.subscribe("DemoFeed")
 
-
+# pylint: disable=unused-argument
 def disconnected(client):
     # Disconnected function will be called when the client disconnects.
     print("Disconnected from Adafruit IO!")
 
-
+# pylint: disable=unused-argument
 def message(client, feed_id, payload):
     # Message function will be called when a subscribed feed has a new value.
     # The feed_id parameter identifies the feed, and the payload parameter has
@@ -80,17 +82,16 @@ def message(client, feed_id, payload):
 wifi.connect()
 
 # Initialize a new MQTT Client object
-client = MQTT(
+mqtt_client = MQTT(
     socket=socket,
     broker="io.adafruit.com",
     username=secrets["aio_user"],
     password=secrets["aio_key"],
-    network_manager=wifi,
-    log=True,
+    network_manager=wifi
 )
 
 # Initialize an Adafruit IO MQTT Client
-io = IO_MQTT(client)
+io = IO_MQTT(mqtt_client)
 
 # Connect the callback methods defined above to Adafruit IO
 io.on_connect = connected

examples/mqtt/adafruit_io_mqtt_time.py renamed to examples/mqtt/adafruit_io_time.py

@@ -1,9 +1,7 @@
 # Adafruit IO provides some built-in MQTT topics
 # for obtaining the current server time, if you don't have
-# access to a RTC module. 
+# access to a RTC module.
 
-import time
-from random import randint
 import board
 import neopixel
 import busio
@@ -52,13 +50,14 @@
 wifi = adafruit_esp32spi_wifimanager.ESPSPI_WiFiManager(esp, secrets, status_light)
 
 # Define callback functions which will be called when certain events happen.
+# pylint: disable=unused-argument
 def connected(client):
     # Connected function will be called when the client is connected to Adafruit IO.
     # This is a good place to subscribe to feed changes.  The client parameter
     # passed to this function is the Adafruit IO MQTT client so you can make
     # calls against it easily.
     print("Connected to Adafruit IO!")
-    
+
     # Subscribe to time/seconds topic
     # https://io.adafruit.com/api/docs/mqtt.html#time-seconds
     io.subscribe_to_time('seconds')
@@ -76,12 +75,12 @@ def connected(client):
     # https://io.adafruit.com/api/docs/mqtt.html#adafruit-io-monitor
     io.subscribe_to_time('hours')
 
-
+# pylint: disable=unused-argument
 def disconnected(client):
     # Disconnected function will be called when the client disconnects.
     print("Disconnected from Adafruit IO!")
 
-
+# pylint: disable=unused-argument
 def message(client, feed_id, payload):
     # Message function will be called when a subscribed feed has a new value.
     # The feed_id parameter identifies the feed, and the payload parameter has
@@ -93,17 +92,16 @@ def message(client, feed_id, payload):
 wifi.connect()
 
 # Initialize a new MQTT Client object
-client = MQTT(
+mqtt_client = MQTT(
     socket=socket,
     broker="io.adafruit.com",
     username=secrets["aio_user"],
     password=secrets["aio_key"],
     network_manager=wifi,
-    log=True
 )
 
 # Initialize an Adafruit IO MQTT Client
-io = IO_MQTT(client)
+io = IO_MQTT(mqtt_client)
 
 # Connect the callback methods defined above to Adafruit IO
 io.on_connect = connected