Transitional fix for new LTR559 library

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

diff --git a/examples/all-in-one-no-pm.py b/examples/all-in-one-no-pm.py
index 962f627548fe0c0b62395e3dacb59e8a755de74a..6bb6873d3b845e01938a488d791810b2814f8fcb 100755 (executable)
--- a/examples/all-in-one-no-pm.py
+++ b/examples/all-in-one-no-pm.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 enviroplus import gas
 
 from bme280 import BME280
 from enviroplus import gas


@@ -13,8 +18,14 @@ from subprocess import PIPE, Popen
 from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont
 from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont

+import logging
+
+logging.basicConfig(
+    format='%(asctime)s.%(msecs)03d %(levelname)-8s %(message)s',
+    level=logging.INFO,
+    datefmt='%Y-%m-%d %H:%M:%S')

 
 

-print("""all-in-one.py - Displays readings from all of Enviro plus' sensors
+logging.info("""all-in-one.py - Displays readings from all of Enviro plus' sensors

 Press Ctrl+C to exit!
 """)
 
 Press Ctrl+C to exit!
 """)
 


@@ -58,7 +69,7 @@ def display_text(variable, data, unit):
                - min(values[variable]) + 1) for v in values[variable]]
     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)
                - min(values[variable]) + 1) for v in values[variable]]
     # Format the variable name and value
     message = "{}: {:.1f} {}".format(variable[:4], data, unit)

-    print(message)
+    logging.info(message)

     draw.rectangle((0, 0, WIDTH, HEIGHT), (255, 255, 255))
     for i in range(len(colours)):
         # Convert the values to colours from red to blue
     draw.rectangle((0, 0, WIDTH, HEIGHT), (255, 255, 255))
     for i in range(len(colours)):
         # Convert the values to colours from red to blue