From: Ciprian Manea <ciprian.manea@gmail.com>
Date: Sun, 18 Aug 2019 19:25:58 +0000 (+0300)
Subject: Merge branch 'master' into improved-logging
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/commitdiff_plain/be4506a78edb35b7bc4514949833cb86459e24c3?ds=sidebyside;hp=-c

Merge branch 'master' into improved-logging
---

be4506a78edb35b7bc4514949833cb86459e24c3
diff --combined examples/luftdaten.py
index dd6e967,27478c5..85e3cb2
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@@ -2,6 -2,7 +2,7 @@@
  
  import requests
  import ST7735
+ import time
  from bme280 import BME280
  from pms5003 import PMS5003, ReadTimeoutError
  from subprocess import PIPE, Popen, check_output
@@@ -12,14 -13,7 +13,14 @@@ try
  except ImportError:
      from smbus import SMBus
  
 -print("""luftdaten.py - Reads temperature, pressure, humidity,
 +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,
  PM2.5, and PM10 from Enviro plus and sends data to Luftdaten,
  the citizen science air quality project.
  
@@@ -78,7 -72,7 +79,7 @@@ def read_values()
  
  # Get CPU temperature to use 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()
      return float(output[output.index('=') + 1:output.rindex("'")])
  
@@@ -169,16 -163,22 +170,22 @@@ font_size = 1
  font = ImageFont.truetype("fonts/Asap/Asap-Bold.ttf", font_size)
  
  # Display Raspberry Pi serial and Wi-Fi status
 -print("Raspberry Pi serial: {}".format(get_serial_number()))
 -print("Wi-Fi: {}\n".format("connected" if check_wifi() else "disconnected"))
 +logging.info("Raspberry Pi serial: {}".format(get_serial_number()))
 +logging.info("Wi-Fi: {}\n".format("connected" if check_wifi() else "disconnected"))
  
+ time_since_update = 0
+ update_time = time.time()
+ 
  # Main loop to read data, display, and send to Luftdaten
  while True:
      try:
+         time_since_update = time.time() - update_time
          values = read_values()
 -        print(values)
 +        logging.info(values)
-         resp = send_to_luftdaten(values, id)
-         logging.info("Response: {}\n".format("ok" if resp else "failed"))
+         if time_since_update > 145:
+             resp = send_to_luftdaten(values, id)
+             update_time = time.time()
 -            print("Response: {}\n".format("ok" if resp else "failed"))
++            logging.info("Response: {}\n".format("ok" if resp else "failed"))
          display_status()
      except Exception as e:
 -        print(e)
 +        logging.info(e)