From 912d8f7dbc629fd4a7017ceb8d64cb6f050f3dea Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 13 Mar 2020 10:42:42 -0400 Subject: [PATCH 1/3] update pyportal aio planter --- pyportal_pet_planter/code.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pyportal_pet_planter/code.py b/pyportal_pet_planter/code.py index c432dc5fa..9349bb42f 100755 --- a/pyportal_pet_planter/code.py +++ b/pyportal_pet_planter/code.py @@ -11,7 +11,7 @@ from adafruit_bitmap_font import bitmap_font from adafruit_display_text.label import Label from adafruit_io.adafruit_io import IO_MQTT -from adafruit_minimqtt import MQTT +import adafruit_minimqtt as MQTT from adafruit_pyportal import PyPortal from adafruit_seesaw.seesaw import Seesaw from simpleio import map_range @@ -181,14 +181,13 @@ continue print("Connected to WiFi!") -# Initialize a new MiniMQTT Client object -mqtt_client = MQTT( - socket=socket, - broker="io.adafruit.com", - username=secrets["aio_username"], - password=secrets["aio_key"], - network_manager=wifi -) +# Initialize MQTT interface with the esp interface +MQTT.set_socket(socket, esp) + +# Initialize a new MQTT Client object +mqtt_client = MQTT.MQTT(broker="https://io.adafruit.com", + username=secrets["aio_user"], + password=secrets["aio_key"]) # Adafruit IO Callback Methods # pylint: disable=unused-argument From f8b20a860b3d80e5809a657afe12c2001b354b8a Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 13 Mar 2020 10:50:16 -0400 Subject: [PATCH 2/3] update aws planter --- PyPortal_AWS_IOT_Planter/code.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/PyPortal_AWS_IOT_Planter/code.py b/PyPortal_AWS_IOT_Planter/code.py index b98f893bc..f9f91bcb9 100755 --- a/PyPortal_AWS_IOT_Planter/code.py +++ b/PyPortal_AWS_IOT_Planter/code.py @@ -15,7 +15,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 from adafruit_aws_iot import MQTT_CLIENT from adafruit_seesaw.seesaw import Seesaw import aws_gfx_helper @@ -82,6 +82,9 @@ wifi.connect() print("Connected!") +# Initialize MQTT interface with the esp interface +MQTT.set_socket(socket, esp) + # Soil Sensor Setup i2c_bus = busio.I2C(board.SCL, board.SDA) ss = Seesaw(i2c_bus, addr=0x36) @@ -120,10 +123,8 @@ def message(client, topic, msg): print("Message from {}: {}".format(topic, msg)) # Set up a new MiniMQTT Client -client = MQTT(socket, - broker = secrets['broker'], - client_id = secrets['client_id'], - network_manager = wifi) +client = MQTT.MQTT(broker = secrets['broker'], + client_id = secrets['client_id']) # Initialize AWS IoT MQTT API Client aws_iot = MQTT_CLIENT(client) From 6cd9b6053e53344e9fdacfc69b964a55adfabecc Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 13 Mar 2020 11:29:49 -0400 Subject: [PATCH 3/3] add gcp --- PyPortal_GCP_IOT_Planter/code.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PyPortal_GCP_IOT_Planter/code.py b/PyPortal_GCP_IOT_Planter/code.py index f845cc880..46fa3f827 100755 --- a/PyPortal_GCP_IOT_Planter/code.py +++ b/PyPortal_GCP_IOT_Planter/code.py @@ -15,7 +15,7 @@ from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager import adafruit_esp32spi.adafruit_esp32spi_socket as socket from adafruit_gc_iot_core import MQTT_API, Cloud_Core -from adafruit_minimqtt import MQTT +import adafruit_minimqtt as MQTT from adafruit_seesaw.seesaw import Seesaw import digitalio @@ -44,6 +44,9 @@ wifi.connect() print("Connected!") +# Initialize MQTT interface with the esp interface +MQTT.set_socket(socket, esp) + # Soil Sensor Setup i2c_bus = busio.I2C(board.SCL, board.SDA) ss = Seesaw(i2c_bus, addr=0x36) @@ -138,12 +141,10 @@ def handle_pump(command): print("Your JWT is: ", jwt) # Set up a new MiniMQTT Client -client = MQTT(socket, - broker=google_iot.broker, - username=google_iot.username, - password=jwt, - client_id=google_iot.cid, - network_manager=wifi) +client = MQTT.MQTT(broker=google_iot.broker, + username=google_iot.username, + password=jwt, + client_id=google_iot.cid) # Initialize Google MQTT API Client google_mqtt = MQTT_API(client) @@ -187,4 +188,5 @@ def handle_pump(command): except (ValueError, RuntimeError) as e: print("Failed to get data, retrying", e) wifi.reset() + google_mqtt.reconnect() continue