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

diff --combined examples/all-in-one-no-pm.py
index 367ebeb0854926c4ad5bf6d145444c85b3a18172,bc19e123d5b7ea175623137f03fa3d13f0c34049..bc19e123d5b7ea175623137f03fa3d13f0c34049
mode 100755,100644..100755
--- 1/examples/all-in-one-no-pm.py
--- 2/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 27478c590c06088cea81334723a92417de559359,99a40c0cdc7dc3562c99986784eda8c040307233..77a6d820d70e327d7affc3ed5f4a887eab19ba02
--- 1/examples/luftdaten.py
--- 2/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)