Merged cipy-master

[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 413b0999be3c6cdc59e70ffdabb3f875972c8c19..8e82b6b969510cd7fc55c5b854efab3d31185212 100755 (executable)
--- a/examples/all-in-one.py
+++ b/examples/all-in-one.py
@@ -84,8 +84,9 @@ def display_text(variable, data, unit):
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():

-    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
+    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)

     output, _error = process.communicate()
     output, _error = process.communicate()

+    output = output.decode()

     return float(output[output.index('=') + 1:output.rindex("'")])
 
 
     return float(output[output.index('=') + 1:output.rindex("'")])
 
 


@@ -198,7 +199,7 @@ try:
 
         if mode == 9:
             variable = "pm10"
 
         if mode == 9:
             variable = "pm10"

-            unit = "g/m3"
+            unit = "ug/m3"

             data = pms5003.read()
             data = data.pm_ug_per_m3(10)
             display_text(variable, data, unit)
             data = pms5003.read()
             data = data.pm_ug_per_m3(10)
             display_text(variable, data, unit)