From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 20 Aug 2019 15:28:38 +0000 (+0100)
Subject: Merge branch 'use-generic-variables' of git://github.com/cipy/enviroplus-python into... 
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/commitdiff_plain/a36c0e8d8d94eae0353e5bff14ac837e17139671?hp=476a391afd0fdced2c3e0294dd3efded0e57a7b7

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

diff --git a/examples/all-in-one.py b/examples/all-in-one.py
index 8784090..85a9a15 100755
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -8,7 +8,7 @@ import ST7735
 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
@@ -193,7 +193,7 @@ try:
             unit = "ug/m3"
             try:
                 data = pms5003.read()
-            except pms5003.ReadTimeoutError:
+            except pmsReadTimeoutError:
                 pass
             else:
                 data = data.pm_ug_per_m3(1.0)
@@ -202,16 +202,24 @@ try:
         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:
+                pass
+            else:
+                data = data.pm_ug_per_m3(2.5)
+                display_text(variables[mode], data, unit)
 
         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:
+                pass
+            else:
+                data = data.pm_ug_per_m3(10)
+                display_text(variables[mode], data, unit)
 
 # Exit cleanly
 except KeyboardInterrupt: