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

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

be4506a78edb35b7bc4514949833cb86459e24c3
diff --cc examples/luftdaten.py
index dd6e967,27478c5..85e3cb2
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@@ -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)