catching the correct ReadTimeoutError for pms5003

[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 ab1a1a76923e15a9940ec2b5aee13ddf6e9064dc..962f627548fe0c0b62395e3dacb59e8a755de74a 100755 (executable)
--- a/examples/all-in-one-no-pm.py
+++ b/examples/all-in-one-no-pm.py
@@ -87,7 +87,7 @@ def get_cpu_temperature():
 # temperature down, and increase to adjust up
 factor = 0.8
 
 # temperature down, and increase to adjust up
 factor = 0.8
 

-cpu_temps = [0] * 5
+cpu_temps = [get_cpu_temperature()] * 5

 
 delay = 0.5  # Debounce the proximity tap
 mode = 0  # The starting mode
 
 delay = 0.5  # Debounce the proximity tap
 mode = 0  # The starting mode


@@ -121,7 +121,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


@@ -129,49 +129,49 @@ 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)

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