Adding all in one weather and light display example

[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 eef99c36b7eea36846073685af9f371823e5642b..03e4d5880d186e4cede2112ac836119b593b72f6 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -5,7 +5,12 @@ 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 pms5003 import PMS5003, ReadTimeoutError as pmsReadTimeoutError
 
 from bme280 import BME280
 from pms5003 import PMS5003, ReadTimeoutError as pmsReadTimeoutError


@@ -196,7 +201,7 @@ try:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:

-                data = data.pm_ug_per_m3(1.0)
+                data = float(data.pm_ug_per_m3(1.0))

                 display_text(variables[mode], data, unit)
 
         if mode == 8:
                 display_text(variables[mode], data, unit)
 
         if mode == 8:


@@ -207,7 +212,7 @@ try:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:

-                data = data.pm_ug_per_m3(2.5)
+                data = float(data.pm_ug_per_m3(2.5))

                 display_text(variables[mode], data, unit)
 
         if mode == 9:
                 display_text(variables[mode], data, unit)
 
         if mode == 9:


@@ -218,7 +223,7 @@ try:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:
             except pmsReadTimeoutError:
                 logging.warn("Failed to read PMS5003")
             else:

-                data = data.pm_ug_per_m3(10)
+                data = float(data.pm_ug_per_m3(10))

                 display_text(variables[mode], data, unit)
 
 # Exit cleanly
                 display_text(variables[mode], data, unit)
 
 # Exit cleanly