replace cert.py with cert loading, gcp references with aws, fix crashes

Author: brentru

PyPortal_AWS_IOT_Planter/aws_gfx_helper.py

@@ -1,5 +1,5 @@
 """
-GFX Helper for PyPortal GCP IoT Plant Monitor
+GFX Helper for PyPortal AWS IoT Plant Monitor
 """
 import board
 import displayio
@@ -12,10 +12,10 @@
 # GFX Font
 font = terminalio.FONT
 
-class Google_GFX(displayio.Group):
+class AWS_GFX(displayio.Group):
     def __init__(self, is_celsius=False):
-        """Creates an Google_GFX object for displaying plant
-        and Google Cloud IoT Core status.
+        """Creates an AWS_GFX object for displaying plant
+        and AWS IoT status.
         :param bool is_celsius: Temperature displayed in Celsius.
         """
         # root displayio group
@@ -39,18 +39,18 @@ def __init__(self, is_celsius=False):
         self._icon_sprite = None
         self._icon_file = None
         self._cwd = cwd
-        self.set_icon(self._cwd+"/images/gcp_splash.bmp")
+        self.set_icon(self._cwd+"/images/aws_splash.bmp")
 
         print('Setting up labels...')
         header_group = displayio.Group(scale=3)
-        header_label = Label(font, text="Google Cloud IoT\n     Planter")
+        header_label = Label(font, text="AWS IoT\n     Planter")
         header_label.x = (self.display.width // 2) // 22
         header_label.y = 15
         header_group.append(header_label)
         self._text_group.append(header_group)
 
         # Temperature Display
-        temp_group = displayio.Group(scale=2, max_size=3)
+        temp_group = displayio.Group(scale=2, max_size=400)
         temp_label = Label(font, text="Temperature: ")
         temp_label.x = (self.display.width//2) // 11
         temp_label.y = 55
@@ -75,27 +75,26 @@ def __init__(self, is_celsius=False):
         temp_group.append(self.water_lvl_label)
         self._text_group.append(water_group)
 
-        # GCP Status
+        # AWS Status
         status_group = displayio.Group()
-        self.gcp_status_label = Label(font, text="Connecting to GCP IoT Core...")
-        self.gcp_status_label.x = self.display.width//4
-        self.gcp_status_label.y = 200
-        status_group.append(self.gcp_status_label)
+        self.aws_status_label = Label(font, text="Connecting to AWS IoT...")
+        self.aws_status_label.x = self.display.width//4
+        self.aws_status_label.y = 200
+        status_group.append(self.aws_status_label)
         self._text_group.append(status_group)
 
         self.display.show(self._text_group)
 
-    def show_gcp_status(self, status_text):
+    def show_aws_status(self, status_text):
         """Displays the system status on the PyPortal
-        :param str status_text: Description of current GCP IoT status
+        :param str status_text: Description of current AWS IoT status.
         """
-        self.gcp_status_label.text = status_text
+        self.aws_status_label.text = status_text
 
     def show_water_level(self, water_data):
         """Displays the water level from the Stemma Soil Sensor.
         :param int water_data: water value
         """
-        print('Water Level: ', water_data)
         self.water_lvl_label.text = str(water_data)
 
     def show_temp(self, temp_data):

PyPortal_AWS_IOT_Planter/aws_splash.bmp

@@ -6,6 +6,7 @@
 
 Author: Brent Rubell for Adafruit Industries, 2019
 """
+import time
 import json
 import board
 import busio
@@ -17,7 +18,10 @@
 from adafruit_minimqtt import MQTT
 from adafruit_aws_iot import MQTT_CLIENT
 from adafruit_seesaw.seesaw import Seesaw
+import aws_gfx_helper
 
+# Time between polling the STEMMA, in minutes
+SENSOR_DELAY = 15
 
 # Get wifi details and more from a secrets.py file
 try:
@@ -26,18 +30,32 @@
     print("WiFi secrets are kept in secrets.py, please add them there!")
     raise
 
-# Get device certificate and private key from a certificates.py file
+# Get device certificate
 try:
-    from certificates import DEVICE_CERT, DEVICE_KEY
+    with open("aws_cert.pem.crt", "rb") as f:
+        DEVICE_CERT = f.read()
 except ImportError:
-    print("Certificate and private key data is kept in certificates.py, \
-           please add them there!")
+    print("Certificate (aws_cert.pem.crt) not found on CIRCUITPY filesystem.")
     raise
 
-# PyPortal ESP32 Setup
-esp32_cs = digitalio.DigitalInOut(board.ESP_CS)
-esp32_ready = digitalio.DigitalInOut(board.ESP_BUSY)
-esp32_reset = digitalio.DigitalInOut(board.ESP_RESET)
+# Get device private key
+try:
+    with open("private.pem.key", "rb") as f:
+        DEVICE_KEY = f.read()
+except ImportError:
+    print("Key (private.pem.key) not found on CIRCUITPY filesystem.")
+    raise
+
+# If you are using a board with pre-defined ESP32 Pins:
+esp32_cs = DigitalInOut(board.ESP_CS)
+esp32_ready = DigitalInOut(board.ESP_BUSY)
+esp32_reset = DigitalInOut(board.ESP_RESET)
+
+# If you have an externally connected ESP32:
+# esp32_cs = DigitalInOut(board.D9)
+# esp32_ready = DigitalInOut(board.D10)
+# esp32_reset = DigitalInOut(board.D5)
+
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
 esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 status_light = neopixel.NeoPixel(board.NEOPIXEL, 1, brightness=0.2)
@@ -60,8 +78,8 @@
 ss = Seesaw(i2c_bus, addr=0x36)
 
 # Initialize the graphics helper
-print("Loading GCP Graphics...")
-gfx = gcp_gfx_helper.Google_GFX()
+print("Loading AWS IoT Graphics...")
+gfx = aws_gfx_helper.AWS_GFX()
 print("Graphics loaded!")
 
 
@@ -98,14 +116,14 @@ def publish(client, userdata, topic, pid):
 
 def message(client, topic, msg):
     # This method is called when the client receives data from a topic.
-    # TODO
+    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,
-               log=True)
+               network_manager = wifi)
 
 # Initialize AWS IoT MQTT API Client
 aws_iot = MQTT_CLIENT(client)
@@ -126,25 +144,27 @@ def message(client, topic, msg):
 
 while True:
     try:
-        gfx.show_gcp_status('Listening for new messages...')
+        gfx.show_aws_status('Listening for msgs...')
         now = time.monotonic()
-        if now - initial > (SENSOR_DELAY * 60):
+        if now - initial > (1 * 60):
             # read moisture level
             moisture = ss.moisture_read()
+            print("Moisture Level: ", moisture)
             # read temperature
             temperature = ss.get_temp()
+            print("Temperature:{}F".format(temperature))
             # Display Soil Sensor values on pyportal
             temperature = gfx.show_temp(temperature)
             gfx.show_water_level(moisture)
             print('Sending data to AWS IoT...')
-            gfx.show_gcp_status('Publishing data...')
+            gfx.show_aws_status('Publishing data...')
             # Create a json-formatted device payload
             payload = {"state":{"reported":
                         {"moisture":str(moisture),
                         "temp":str(temperature)}}}
             # Update device shadow
             aws_iot.shadow_update(json.dumps(payload))
-            gfx.show_gcp_status('Data published!')
+            gfx.show_aws_status('Data published!')
             print('Data sent!')
             # Reset timer
             initial = now