Expand test coverage, bugfix

[EVA-2020-02-2.git] / examples / luftdaten.py

diff --git a/examples/luftdaten.py b/examples/luftdaten.py
index d22be88f822a5db6ffdf0292d37d2b558c39cf77..4d3d49acd87a86dae17d79f51981f67d75fc261a 100755 (executable)
--- a/examples/luftdaten.py
+++ b/examples/luftdaten.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-import time
-import json
 import requests
 import ST7735
 from bme280 import BME280
@@ -14,12 +12,15 @@ try:
 except ImportError:
     from smbus import SMBus
 
-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.
+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.
 
-Note: you'll need to register with Luftdaten at: https://meine.luftdaten.info/ and
-enter your Raspberry Pi serial number that's displayed on the Enviro plus LCD
-along with the other details before the data appears on the Luftdaten map.
+Note: you'll need to register with Luftdaten at:
+https://meine.luftdaten.info/ and enter your Raspberry Pi
+serial number that's displayed on the Enviro plus LCD along
+with the other details before the data appears on the
+Luftdaten map.
 
 Press Ctrl+C to exit!
 
@@ -30,9 +31,6 @@ bus = SMBus(1)
 # Create BME280 instance
 bme280 = BME280(i2c_dev=bus)
 
-# Create PMS5003 instance
-pms5003 = PMS5003()
-
 # Create LCD instance
 disp = ST7735.ST7735(
     port=0,
@@ -46,6 +44,10 @@ disp = ST7735.ST7735(
 # Initialize display
 disp.begin()
 
+# Create PMS5003 instance
+pms5003 = PMS5003()
+
+
 # Read values from BME280 and PMS5003 and return as dict
 def read_values():
     values = {}
@@ -60,24 +62,27 @@ def read_values():
         values["P2"] = str(pm_values.pm_ug_per_m3(2.5))
         values["P1"] = str(pm_values.pm_ug_per_m3(10))
     except ReadTimeoutError:
-        pms5003 = PMS5003()
+        pms5003.reset()
         pm_values = pms5003.read()
         values["P2"] = str(pm_values.pm_ug_per_m3(2.5))
         values["P1"] = str(pm_values.pm_ug_per_m3(10))
     return values
 
+
 # Get CPU temperature to use for compensation
 def get_cpu_temperature():
     process = Popen(['vcgencmd', 'measure_temp'], stdout=PIPE)
     output, _error = process.communicate()
     return float(output[output.index('=') + 1:output.rindex("'")])
 
+
 # Get Raspberry Pi serial number to use as ID
 def get_serial_number():
-    with open('/proc/cpuinfo','r') as f:
+    with open('/proc/cpuinfo', 'r') as f:
         for line in f:
-            if line[0:6]=='Serial':
-                return(line.split(":")[1].strip())
+            if line[0:6] == 'Serial':
+                return line.split(":")[1].strip()
+
 
 # Check for Wi-Fi connection
 def check_wifi():
@@ -86,6 +91,7 @@ def check_wifi():
     else:
         return False
 
+
 # Display Raspberry Pi serial and Wi-Fi status on LCD
 def display_status():
     wifi_status = "connected" if check_wifi() else "disconnected"
@@ -102,34 +108,37 @@ def display_status():
     draw.text((x, y), message, font=font, fill=text_colour)
     disp.display(img)
 
+
 def send_to_luftdaten(values, id):
     pm_values = dict(i for i in values.items() if i[0].startswith("P"))
     temp_values = dict(i for i in values.items() if not i[0].startswith("P"))
 
     resp_1 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-        json={
-            "software_version": "enviro-plus 0.0.1",
-            "sensordatavalues": [{"value_type": key, "value": val} for key, val in pm_values.items()]
-        },
-        headers={
-            "X-PIN":    "1",
-            "X-Sensor": id,
-            "Content-Type": "application/json",
-            "cache-control": "no-cache"
-        }
+             json={
+                 "software_version": "enviro-plus 0.0.1",
+                 "sensordatavalues": [{"value_type": key, "value": val} for
+                                      key, val in pm_values.items()]
+             },
+             headers={
+                 "X-PIN":    "1",
+                 "X-Sensor": id,
+                 "Content-Type": "application/json",
+                 "cache-control": "no-cache"
+             }
     )
 
     resp_2 = requests.post("https://api.luftdaten.info/v1/push-sensor-data/",
-        json={
-            "software_version": "enviro-plus 0.0.1",
-            "sensordatavalues": [{"value_type": key, "value": val} for key, val in temp_values.items()]
-        },
-        headers={
-            "X-PIN":    "11",
-            "X-Sensor": id,
-            "Content-Type": "application/json",
-            "cache-control": "no-cache"
-        }
+             json={
+                 "software_version": "enviro-plus 0.0.1",
+                 "sensordatavalues": [{"value_type": key, "value": val} for
+                                      key, val in temp_values.items()]
+             },
+             headers={
+                 "X-PIN":    "11",
+                 "X-Sensor": id,
+                 "Content-Type": "application/json",
+                 "cache-control": "no-cache"
+             }
     )
 
     if resp_1.ok and resp_2.ok:
@@ -137,6 +146,7 @@ def send_to_luftdaten(values, id):
     else:
         return False
 
+
 # Compensation factor for temperature
 comp_factor = 1.2