Merge branch 'use-generic-variables' of git://github.com/cipy/enviroplus-python into...

[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 ca0760b6e84f651a456921b88f5ed34f37a1c424..85a9a155ce8e7c12860f64c3e394cc0bfabe056b 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -8,14 +8,20 @@ import ST7735
 import ltr559
 
 from bme280 import BME280
 import ltr559
 
 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 PIL import ImageDraw
 from PIL import ImageFont
 from enviroplus import gas
 from subprocess import PIPE, Popen
 from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont

+import logging

 
 

-print("""all-in-one.py - Displays readings from all of Enviro plus' sensors
+logging.basicConfig(
+    format='%(asctime)s.%(msecs)03d %(levelname)-8s %(message)s',
+    level=logging.INFO,
+    datefmt='%Y-%m-%d %H:%M:%S')
+
+logging.info("""all-in-one.py - Displays readings from all of Enviro plus' sensors

 
 Press Ctrl+C to exit!
 
 
 Press Ctrl+C to exit!
 


@@ -64,7 +70,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


@@ -130,7 +136,7 @@ try:
 
         # One mode for each variable
         if mode == 0:
 
         # One mode for each variable
         if mode == 0:

-            variable = "temperature"
+            # variable = "temperature"

             unit = "C"
             cpu_temp = get_cpu_temperature()
             # Smooth out with some averaging to decrease jitter
             unit = "C"
             cpu_temp = get_cpu_temperature()
             # Smooth out with some averaging to decrease jitter


@@ -138,70 +144,82 @@ try:
             avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
             raw_temp = bme280.get_temperature()
             data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)
             avg_cpu_temp = sum(cpu_temps) / float(len(cpu_temps))
             raw_temp = bme280.get_temperature()
             data = raw_temp - ((avg_cpu_temp - raw_temp) / factor)

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 1:
 
         if mode == 1:

-            variable = "pressure"
+            # variable = "pressure"

             unit = "hPa"
             data = bme280.get_pressure()
             unit = "hPa"
             data = bme280.get_pressure()

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 2:
 
         if mode == 2:

-            variable = "humidity"
+            # variable = "humidity"

             unit = "%"
             data = bme280.get_humidity()
             unit = "%"
             data = bme280.get_humidity()

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 3:
 
         if mode == 3:

-            variable = "light"
+            # variable = "light"

             unit = "Lux"
             if proximity < 10:
                 data = ltr559.get_lux()
             else:
                 data = 1
             unit = "Lux"
             if proximity < 10:
                 data = ltr559.get_lux()
             else:
                 data = 1

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 4:
 
         if mode == 4:

-            variable = "oxidised"
+            # variable = "oxidised"

             unit = "kO"
             data = gas.read_all()
             data = data.oxidising / 1000
             unit = "kO"
             data = gas.read_all()
             data = data.oxidising / 1000

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 5:
 
         if mode == 5:

-            variable = "reduced"
+            # variable = "reduced"

             unit = "kO"
             data = gas.read_all()
             data = data.reducing / 1000
             unit = "kO"
             data = gas.read_all()
             data = data.reducing / 1000

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 6:
 
         if mode == 6:

-            variable = "nh3"
+            # variable = "nh3"

             unit = "kO"
             data = gas.read_all()
             data = data.nh3 / 1000
             unit = "kO"
             data = gas.read_all()
             data = data.nh3 / 1000

-            display_text(variable, data, unit)
+            display_text(variables[mode], data, unit)

 
         if mode == 7:
 
         if mode == 7:

-            variable = "pm1"
+            # variable = "pm1"

             unit = "ug/m3"
             unit = "ug/m3"

-            data = pms5003.read()
-            data = data.pm_ug_per_m3(1.0)
-            display_text(variable, data, unit)
+            try:
+                data = pms5003.read()
+            except pmsReadTimeoutError:
+                pass
+            else:
+                data = data.pm_ug_per_m3(1.0)
+                display_text(variables[mode], data, unit)

 
         if mode == 8:
 
         if mode == 8:

-            variable = "pm25"
+            # variable = "pm25"

             unit = "ug/m3"
             unit = "ug/m3"

-            data = pms5003.read()
-            data = data.pm_ug_per_m3(2.5)
-            display_text(variable, data, unit)
+            try:
+                data = pms5003.read()
+            except pmsReadTimeoutError:
+                pass
+            else:
+                data = data.pm_ug_per_m3(2.5)
+                display_text(variables[mode], data, unit)

 
         if mode == 9:
 
         if mode == 9:

-            variable = "pm10"
+            # variable = "pm10"

             unit = "ug/m3"
             unit = "ug/m3"

-            data = pms5003.read()
-            data = data.pm_ug_per_m3(10)
-            display_text(variable, data, unit)
+            try:
+                data = pms5003.read()
+            except pmsReadTimeoutError:
+                pass
+            else:
+                data = data.pm_ug_per_m3(10)
+                display_text(variables[mode], data, unit)

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