PR comments

Author: justmobilize

examples/cellular/minimqtt_adafruitio_cellular.py

@@ -33,10 +33,10 @@
 ### Feeds ###
 
 # Setup a feed named 'photocell' for publishing to a feed
-photocell_feed = aio_username + "/feeds/photocell"
+photocell_feed = f"{aio_username}/feeds/photocell"
 
 # Setup a feed named 'onoff' for subscribing to changes
-onoff_feed = aio_username + "/feeds/onoff"
+onoff_feed = f"{aio_username}/feeds/onoff"
 
 ### Code ###
 

examples/cellular/minimqtt_simpletest_cellular.py

@@ -21,6 +21,7 @@
 apn_password = getenv("apn_password")
 aio_username = getenv("ADAFRUIT_AIO_USERNAME")
 aio_key = getenv("ADAFRUIT_AIO_KEY")
+broker = getenv("broker", "io.adafruit.com")
 
 # Create a serial connection for the FONA connection
 uart = busio.UART(board.TX, board.RX)
@@ -88,7 +89,7 @@ def publish(client, userdata, topic, pid):
 
 # Set up a MiniMQTT Client
 client = MQTT.MQTT(
-    broker="io.adafruit.com",
+    broker=broker,
     username=aio_username,
     password=aio_key,
     is_ssl=False,

examples/cpython/minimqtt_adafruitio_cpython.py

@@ -21,10 +21,10 @@
 ### Feeds ###
 
 # Setup a feed named 'photocell' for publishing to a feed
-photocell_feed = aio_username + "/feeds/photocell"
+photocell_feed = f"{aio_username}/feeds/photocell"
 
 # Setup a feed named 'onoff' for subscribing to changes
-onoff_feed = aio_username + "/feeds/onoff"
+onoff_feed = f"{aio_username}/feeds/onoff"
 
 ### Code ###
 

examples/cpython/minimqtt_simpletest_cpython.py

@@ -8,12 +8,15 @@
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 
 # Add your Adafruit IO username and key to your env.
+# (visit io.adafruit.com if you need to create an account, or if you need your Adafruit IO key.)
 # example:
 # export ADAFRUIT_AIO_USERNAME=your-aio-username
 # export ADAFRUIT_AIO_KEY=your-aio-key
+# export broker=io.adafruit.com
 
 aio_username = getenv("ADAFRUIT_AIO_USERNAME")
 aio_key = getenv("ADAFRUIT_AIO_KEY")
+broker = getenv("broker", "io.adafruit.com")
 
 ### Topic Setup ###
 
@@ -23,7 +26,7 @@
 
 # Adafruit IO-style Topic
 # Use this topic if you'd like to connect to io.adafruit.com
-# mqtt_topic = aio_username + "/feeds/temperature"
+# mqtt_topic = f"{aio_username}/feeds/temperature"
 
 
 ### Code ###
@@ -63,7 +66,7 @@ def message(client, topic, message):
 
 # Set up a MiniMQTT Client
 mqtt_client = MQTT.MQTT(
-    broker="io.adafruit.com",
+    broker=broker,
     username=aio_username,
     password=aio_key,
     socket_pool=socket,

examples/esp32spi/minimqtt_adafruitio_esp32spi.py

@@ -47,10 +47,10 @@
 ### Feeds ###
 
 # Setup a feed named 'photocell' for publishing to a feed
-photocell_feed = aio_username + "/feeds/photocell"
+photocell_feed = f"{aio_username}/feeds/photocell"
 
 # Setup a feed named 'onoff' for subscribing to changes
-onoff_feed = aio_username + "/feeds/onoff"
+onoff_feed = f"{aio_username}/feeds/onoff"
 
 ### Code ###
 

examples/esp32spi/minimqtt_pub_sub_blocking_esp32spi.py

@@ -47,7 +47,7 @@
 ### Adafruit IO Setup ###
 
 # Setup a feed named `testfeed` for publishing.
-default_topic = aio_username + "/feeds/testfeed"
+default_topic = f"{aio_username}/feeds/testfeed"
 
 ### Code ###
 

examples/esp32spi/minimqtt_pub_sub_blocking_topic_callbacks_esp32spi.py

@@ -14,10 +14,13 @@
 import adafruit_minimqtt.adafruit_minimqtt as MQTT
 
 # Get WiFi details and broker keys, ensure these are setup in settings.toml
+# (visit io.adafruit.com if you need to create an account, or if you need your Adafruit IO key.)
 ssid = getenv("CIRCUITPY_WIFI_SSID")
 password = getenv("CIRCUITPY_WIFI_PASSWORD")
-broker = getenv("broker")
-broker_port = getenv("broker_port")
+aio_username = getenv("ADAFRUIT_AIO_USERNAME")
+aio_key = getenv("ADAFRUIT_AIO_KEY")
+broker = getenv("broker", "io.adafruit.com")
+broker_port = int(getenv("broker_port", "8883"))  # Port 1883 insecure, 8883 secure
 
 ### WiFi ###
 
@@ -75,7 +78,7 @@ def on_battery_msg(client, topic, message):
     # Method called when device/batteryLife has a new value
     print(f"Battery level: {message}v")
 
-    # client.remove_topic_callback(aio_username + "/feeds/device.batterylevel")
+    # client.remove_topic_callback(f"{aio_username}/feeds/device.batterylevel")
 
 
 def on_message(client, topic, message):
@@ -95,6 +98,8 @@ def on_message(client, topic, message):
 client = MQTT.MQTT(
     broker=broker,
     port=broker_port,
+    username=aio_username,
+    password=aio_key,
     socket_pool=pool,
     ssl_context=ssl_context,
 )
@@ -105,14 +110,14 @@ def on_message(client, topic, message):
 client.on_subscribe = subscribe
 client.on_unsubscribe = unsubscribe
 client.on_message = on_message
-client.add_topic_callback(aio_username + "/feeds/device.batterylevel", on_battery_msg)
+client.add_topic_callback(f"{aio_username}/feeds/device.batterylevel", on_battery_msg)
 
 # Connect the client to the MQTT broker.
 print("Connecting to MQTT broker...")
 client.connect()
 
 # Subscribe to all notifications on the device group
-client.subscribe(aio_username + "/groups/device", 1)
+client.subscribe(f"{aio_username}/groups/device", 1)
 
 # Start a blocking message loop...
 # NOTE: NO code below this loop will execute

examples/esp32spi/minimqtt_pub_sub_nonblocking_esp32spi.py

@@ -47,7 +47,7 @@
 ### Adafruit IO Setup ###
 
 # Setup a feed named `testfeed` for publishing.
-default_topic = aio_username + "/feeds/testfeed"
+default_topic = f"{aio_username}/feeds/testfeed"
 
 
 ### Code ###

examples/esp32spi/minimqtt_pub_sub_pyportal_esp32spi.py

@@ -15,6 +15,7 @@
 # (visit io.adafruit.com if you need to create an account, or if you need your Adafruit IO key.)
 aio_username = getenv("ADAFRUIT_AIO_USERNAME")
 aio_key = getenv("ADAFRUIT_AIO_KEY")
+broker = getenv("broker", "io.adafruit.com")
 
 # ------------- MQTT Topic Setup ------------- #
 mqtt_topic = "test/topic"
@@ -53,7 +54,7 @@ def message(client, topic, message):
 
 # Set up a MiniMQTT Client
 mqtt_client = MQTT.MQTT(
-    broker="io.adafruit.com",
+    broker=broker,
     username=aio_username,
     password=aio_key,
     is_ssl=False,

examples/esp32spi/minimqtt_simpletest_esp32spi.py

@@ -17,6 +17,7 @@
 password = getenv("CIRCUITPY_WIFI_PASSWORD")
 aio_username = getenv("ADAFRUIT_AIO_USERNAME")
 aio_key = getenv("ADAFRUIT_AIO_KEY")
+broker = getenv("broker", "io.adafruit.com")
 
 # If you are using a board with pre-defined ESP32 Pins:
 esp32_cs = DigitalInOut(board.ESP_CS)
@@ -38,7 +39,7 @@
     except RuntimeError as e:
         print("could not connect to AP, retrying: ", e)
         continue
-print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
+print("Connected to", esp.ap_info.ssid, "\tRSSI:", esp.ap_info.rssi)
 
 ### Topic Setup ###
 
@@ -48,7 +49,7 @@
 
 # Adafruit IO-style Topic
 # Use this topic if you'd like to connect to io.adafruit.com
-# mqtt_topic = aio_username + '/feeds/temperature'
+# mqtt_topic = f"{aio_username}/feeds/temperature"
 
 ### Code ###
 
@@ -91,7 +92,7 @@ def message(client, topic, message):
 
 # Set up a MiniMQTT Client
 mqtt_client = MQTT.MQTT(
-    broker="io.adafruit.com",
+    broker=broker,
     username=aio_username,
     password=aio_key,
     socket_pool=pool,