From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 20 Aug 2019 15:08:53 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/topshed/enviroplus-python into topshed... 
X-Git-Url: https://zdv2.bktei.com/gitweb/EVA-2020-02-2.git/commitdiff_plain/fbb7f1799ec8c13bb07c6f5f1fb5b744ef86cb86?ds=inline;hp=-c

Merge branch 'master' of git://github.com/topshed/enviroplus-python into topshed-master
---

fbb7f1799ec8c13bb07c6f5f1fb5b744ef86cb86
diff --combined examples/all-in-one-no-pm.py
index 367ebeb,bc19e12..bc19e12
mode 100755,100644..100755
--- a/examples/all-in-one-no-pm.py
+++ b/examples/all-in-one-no-pm.py
@@@ -80,6 -80,7 +80,7 @@@ def display_text(variable, data, unit)
  def get_cpu_temperature():
      process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
      output, _error = process.communicate()
+     output = output.decode()
      return float(output[output.index('=') + 1:output.rindex("'")])
  
  
diff --combined examples/luftdaten.py
index 27478c5,99a40c0..77a6d82
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@@ -2,7 -2,6 +2,7 @@@
  
  import requests
  import ST7735
 +import time
  from bme280 import BME280
  from pms5003 import PMS5003, ReadTimeoutError
  from subprocess import PIPE, Popen, check_output
@@@ -74,6 -73,7 +74,7 @@@ def read_values()
  def get_cpu_temperature():
      process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
      output, _error = process.communicate()
+     output = output.decode()
      return float(output[output.index('=') + 1:output.rindex("'")])
  
  
@@@ -166,19 -166,13 +167,19 @@@ font = ImageFont.truetype("fonts/Asap/A
  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()
 +
  # 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)
 -        resp = send_to_luftdaten(values, id)
 -        print("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"))
          display_status()
      except Exception as e:
          print(e)