From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 20 Aug 2019 15:22:05 +0000 (+0100)
Subject: Merged cipy-improved-logging, omitted luftdaten.py for now
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/commitdiff_plain/23cf04451d7cb0d6acf6b4b55bd3f57d11c6cc24?hp=be4506a78edb35b7bc4514949833cb86459e24c3

Merged cipy-improved-logging, omitted luftdaten.py for now
---

diff --git a/examples/compensated-temperature.py b/examples/compensated-temperature.py
index 6a9c115..74b6bab 100755
--- a/examples/compensated-temperature.py
+++ b/examples/compensated-temperature.py
@@ -2,7 +2,6 @@
 
 import time
 from bme280 import BME280
-from subprocess import PIPE, Popen
 
 try:
     from smbus2 import SMBus
@@ -31,9 +30,10 @@ bme280 = BME280(i2c_dev=bus)
 
 # Get the temperature of the CPU for compensation
 def get_cpu_temperature():
-    process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)
-    output, _error = process.communicate()
-    return float(output[output.index('=') + 1:output.rindex("'")])
+    with open("/sys/class/thermal/thermal_zone0/temp", "r") as f:
+        temp = f.read()
+        temp = int(temp) / 1000.0
+    return temp
 
 
 # Tuning factor for compensation. Decrease this number to adjust the
diff --git a/examples/luftdaten.py b/examples/luftdaten.py
index 85e3cb2..9995914 100755
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@ -13,14 +13,7 @@ try:
 except ImportError:
     from smbus import SMBus
 
-import logging
-
-logging.basicConfig(
-    format='%(asctime)s.%(msecs)03d %(levelname)-8s %(message)s',
-    level=logging.INFO,
-    datefmt='%Y-%m-%d %H:%M:%S')
-
-logging.info("""luftdaten.py - Reads temperature, pressure, humidity,
+print("""luftdaten.py - Reads temperature, pressure, humidity,
 PM2.5, and PM10 from Enviro plus and sends data to Luftdaten,
 the citizen science air quality project.
 
@@ -81,6 +74,7 @@ def read_values():
 def get_cpu_temperature():
     process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE, universal_newlines=True)
     output, _error = process.communicate()
+    output = output.decode()
     return float(output[output.index('=') + 1:output.rindex("'")])
 
 
@@ -170,8 +164,8 @@ font_size = 16
 font = ImageFont.truetype("fonts/Asap/Asap-Bold.ttf", font_size)
 
 # Display Raspberry Pi serial and Wi-Fi status
-logging.info("Raspberry Pi serial: {}".format(get_serial_number()))
-logging.info("Wi-Fi: {}\n".format("connected" if check_wifi() else "disconnected"))
+print("Raspberry Pi serial: {}".format(get_serial_number()))
+print("Wi-Fi: {}\n".format("connected" if check_wifi() else "disconnected"))
 
 time_since_update = 0
 update_time = time.time()
@@ -181,11 +175,11 @@ while True:
     try:
         time_since_update = time.time() - update_time
         values = read_values()
-        logging.info(values)
+        print(values)
         if time_since_update > 145:
             resp = send_to_luftdaten(values, id)
             update_time = time.time()
-            logging.info("Response: {}\n".format("ok" if resp else "failed"))
+            print("Response: {}\n".format("ok" if resp else "failed"))
         display_status()
     except Exception as e:
-        logging.info(e)
+        print(e)