pylinting

Author: brentru

PyPortal_Azure_Plant_Monitor/azure_gfx_helper.py

@@ -1,5 +1,5 @@
 """
-GFX Helper for pyportal_azure_iot_temperature.py
+GFX Helper for PyPortal Azure IoT Plant Monitor
 """
 import board
 import displayio
@@ -9,86 +9,114 @@
 cwd = ("/"+__file__).rsplit('/', 1)[0] # the current working directory (where this file is)
 
 # Fonts within /fonts folder
-info_font = cwd+"/fonts/Nunito-Black-17.bdf"
-temperature_font = cwd+"/fonts/Nunito-Light-75.bdf"
+main_font = cwd+"/fonts/EarthHeart-26.bdf"
+data_font = cwd+"/fonts/Collegiate-50.bdf"
 
 class Azure_GFX(displayio.Group):
-    def __init__(self, celsius=False):
+    def __init__(self, is_celsius=True, device_id="Azure"):
         """Creates an Azure_GFX object.
-        :param bool celsius: Temperature displayed as F or C
+        :param bool is_celsius: Temperature displayed in Celsius.
+        :param str device_id: Unique device identifier from secrets.py file.
         """
         # root displayio group
-        root_group = displayio.Group(max_size=20)
+        root_group = displayio.Group(max_size=23)
         board.DISPLAY.show(root_group)
-        super().__init__(max_size=20)
+        super().__init__(max_size=15)
 
-        self._celsius = celsius
+        # temperature display option
+        self._is_celsius = is_celsius
 
         # create background icon group
-        self._icon_group = displayio.Group(max_size=1)
+        self._icon_group = displayio.Group(max_size=3)
         self.append(self._icon_group)
         board.DISPLAY.show(self._icon_group)
         # create text object group
-        self._text_group = displayio.Group(max_size=6)
+        self._text_group = displayio.Group(max_size=9)
         self.append(self._text_group)
 
         self._icon_sprite = None
         self._icon_file = None
         self._cwd = cwd
         self.set_icon(self._cwd+"/images/azure_splash.bmp")
 
-        print('Loading Fonts...')
-        glyphs = b'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-,.:/ '
-        self.info_font = bitmap_font.load_font(info_font)
-        self.info_font.load_glyphs(glyphs)
-
-        self.c_font = bitmap_font.load_font(temperature_font)
-        self.c_font.load_glyphs(glyphs)
-        self.c_font.load_glyphs(('°',)) # extra glyph for temperature font
+        print('loading fonts...')
+        glyphs = b'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-,.: '
+        data_glyphs = b'012345678-,.:/FC°'
+        self.main_font = bitmap_font.load_font(main_font)
+        self.main_font.load_glyphs(glyphs)
+        self.data_font = bitmap_font.load_font(data_font)
+        self.data_font.load_glyphs(data_glyphs)
 
         print('setting up labels...')
-        self.title_text = Label(self.info_font, text="Azure IoT Temperature Logger")
-        self.title_text.x = 55
-        self.title_text.y = 15
+        self.title_text = Label(self.main_font, text="Azure Plant Monitor")
+        self.title_text.x = 35
+        self.title_text.y = 25
         self._text_group.append(self.title_text)
 
-        self.temp_text = Label(self.c_font, max_glyphs=8)
-        self.temp_text.x = 25
-        self.temp_text.y = 110
+        self.temp_label = Label(self.main_font, text="Temperature")
+        self.temp_label.x = 0
+        self.temp_label.y = 65
+        self._text_group.append(self.temp_label)
+
+        self.temp_text = Label(self.data_font, max_glyphs=10)
+        self.temp_text.x = 200
+        self.temp_text.y = 85
         self._text_group.append(self.temp_text)
 
-        self.azure_status_text = Label(self.info_font, max_glyphs=40)
-        self.azure_status_text.x = 100
-        self.azure_status_text.y = 220
+        self.moisture_label = Label(self.main_font, text="Moisture Level")
+        self.moisture_label.x = 0
+        self.moisture_label.y = 135
+        self._text_group.append(self.moisture_label)
+
+        self.moisture_text = Label(self.data_font, max_glyphs=10)
+        self.moisture_text.x = 200
+        self.moisture_text.y = 175
+        self._text_group.append(self.moisture_text)
+
+        self.azure_status_text = Label(self.main_font, max_glyphs=15)
+        self.azure_status_text.x = 65
+        self.azure_status_text.y = 225
         self._text_group.append(self.azure_status_text)
 
         board.DISPLAY.show(self._text_group)
 
+
     def display_azure_status(self, status_text):
-        """Displays the current Azure IoT status.
+        """Displays the system status on the PyPortal
         :param str status_text: Description of Azure IoT status
         """
         self.azure_status_text.text = status_text
 
-    def display_temp(self, adt_data):
-        """Displays the data from the ADT7410 on the.
-        :param float adt_data: Value from the ADT7410
+    def display_moisture(self, moisture_data):
+        """Displays the moisture from the Stemma Soil Sensor.
+        :param int moisture_data: Moisture value
+        """
+        print('Moisture Level: ', moisture_data)
+        self.moisture_text.text = str(moisture_data)
+
+    def display_temp(self, temp_data):
+        """Displays the temperature from the Stemma Soil Sensor.
+        :param float temp_data: Temperature value.
         """
-        if not self._celsius:
-            adt_data = (adt_data * 9 / 5) + 32
-            print('Temperature: %0.2f°F'%adt_data)
-            if adt_data >= 212:
+        if not self._is_celsius:
+            temp_data = (temp_data * 9 / 5) + 32 - 15
+            print('Temperature: %0.0f°F'%temp_data)
+            if temp_data >= 212:
                 self.temp_text.color = 0xFD2EE
-            elif adt_data <= 32:
+            elif temp_data <= 32:
                 self.temp_text.color = 0xFF0000
-            self.temp_text.text = '%0.2f°F'%adt_data
+            self.temp_text.text = '%0.0f°F'%temp_data
+            temp_data = '%0.0f'%temp_data
+            return int(temp_data)
         else:
-            print('Temperature: %0.2f°C'%adt_data)
-            if adt_data <= 0:
+            print('Temperature: %0.0f°C'%temp_data)
+            if temp_data <= 0:
                 self.temp_text.color = 0xFD2EE
-            elif adt_data >= 100:
+            elif temp_data >= 100:
                 self.temp_text.color = 0xFF0000
-            self.temp_text.text = '%0.2f°C'%adt_data
+            self.temp_text.text = '%0.0f°C'%temp_data
+            temp_data = '%0.0f'%temp_data
+            return int(temp_data)
 
     def set_icon(self, filename):
         """Sets the background image to a bitmap file.

PyPortal_Azure_Plant_Monitor/code.py

@@ -6,9 +6,9 @@
 
 Author: Brent Rubell for Adafruit Industries, 2019
 """
+import time
 import board
 import busio
-import time
 from digitalio import DigitalInOut
 from adafruit_esp32spi import adafruit_esp32spi, adafruit_esp32spi_wifimanager
 import neopixel
@@ -42,7 +42,7 @@
 hub = IOT_Hub(wifi, secrets['azure_iot_hub'], secrets['azure_iot_sas'], secrets['azure_device_id'])
 
 # init. graphics helper
-gfx = azure_gfx_helper.Azure_GFX(is_celsius=False)
+gfx = azure_gfx_helper.Azure_GFX(False)
 
 while True:
     try:
@@ -63,4 +63,4 @@
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         continue
-    time.sleep(60)
+    time.sleep(60)