Transitional fix for new LTR559 library

[EVA-2020-02-2.git] / examples / all-in-one.py

diff --git a/examples/all-in-one.py b/examples/all-in-one.py
index 87840901fd5efd3610d2aecbb943ed6c27432d41..87acc6fd8fbf09e4f5ebd9fd72a90ec2b674f3dc 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -5,10 +5,15 @@ import colorsys
 import os
 import sys
 import ST7735
 import os
 import sys
 import ST7735

-import ltr559
+try:
+    # Transitional fix for breaking change in LTR559
+    from ltr559 import LTR559
+    ltr559 = LTR559()
+except ImportError:
+    import ltr559

 
 from bme280 import BME280
 
 from bme280 import BME280

-from pms5003 import PMS5003
+from pms5003 import PMS5003, ReadTimeoutError as pmsReadTimeoutError

 from enviroplus import gas
 from subprocess import PIPE, Popen
 from PIL import Image
 from enviroplus import gas
 from subprocess import PIPE, Popen
 from PIL import Image


@@ -102,7 +107,7 @@ factor = 0.8
 cpu_temps = [get_cpu_temperature()] * 5
 
 delay = 0.5  # Debounce the proximity tap
 cpu_temps = [get_cpu_temperature()] * 5
 
 delay = 0.5  # Debounce the proximity tap

-mode = 0  # The starting mode
+mode = 0     # The starting mode

 last_page = 0
 light = 1
 
 last_page = 0
 light = 1
 


@@ -193,8 +198,8 @@ try:
             unit = "ug/m3"
             try:
                 data = pms5003.read()
             unit = "ug/m3"
             try:
                 data = pms5003.read()

-            except pms5003.ReadTimeoutError:
-                pass
+            except pmsReadTimeoutError:
+                logging.warn("Failed to read PMS5003")

             else:
                 data = data.pm_ug_per_m3(1.0)
                 display_text(variables[mode], data, unit)
             else:
                 data = data.pm_ug_per_m3(1.0)
                 display_text(variables[mode], data, unit)


@@ -202,16 +207,24 @@ try:
         if mode == 8:
             # variable = "pm25"
             unit = "ug/m3"
         if mode == 8:
             # variable = "pm25"
             unit = "ug/m3"

-            data = pms5003.read()
-            data = data.pm_ug_per_m3(2.5)
-            display_text(variables[mode], data, unit)
+            try:
+                data = pms5003.read()
+            except pmsReadTimeoutError:
+                logging.warn("Failed to read PMS5003")
+            else:
+                data = data.pm_ug_per_m3(2.5)
+                display_text(variables[mode], data, unit)

 
         if mode == 9:
             # variable = "pm10"
             unit = "ug/m3"
 
         if mode == 9:
             # variable = "pm10"
             unit = "ug/m3"

-            data = pms5003.read()
-            data = data.pm_ug_per_m3(10)
-            display_text(variables[mode], data, unit)
+            try:
+                data = pms5003.read()
+            except pmsReadTimeoutError:
+                logging.warn("Failed to read PMS5003")
+            else:
+                data = data.pm_ug_per_m3(10)
+                display_text(variables[mode], data, unit)

 
 # Exit cleanly
 except KeyboardInterrupt:
 
 # Exit cleanly
 except KeyboardInterrupt: