Merge pull request #82 from roscoe81/master

Address Issue #81

Author: Gadgetoid

examples/luftdaten.py

@@ -4,7 +4,7 @@
 import ST7735
 import time
 from bme280 import BME280
-from pms5003 import PMS5003, ReadTimeoutError
+from pms5003 import PMS5003, ReadTimeoutError, ChecksumMismatchError
 from subprocess import PIPE, Popen, check_output
 from PIL import Image, ImageDraw, ImageFont
 from fonts.ttf import RobotoMedium as UserFont
@@ -13,20 +13,26 @@
     from smbus2 import SMBus
 except ImportError:
     from smbus import SMBus
+import logging
 
-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.
+logging.basicConfig(
+    format='%(asctime)s.%(msecs)03d %(levelname)-8s %(message)s',
+    level=logging.INFO,
+    datefmt='%Y-%m-%d %H:%M:%S')
 
-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.
+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.
 
-Press Ctrl+C to exit!
+#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!
+
+#""")
 
 bus = SMBus(1)
 
@@ -63,7 +69,8 @@ def read_values():
         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))
-    except ReadTimeoutError:
+    except(ReadTimeoutError, ChecksumMismatchError):
+        logging.info("Failed to read PMS5003. Reseting and retrying.")
         pms5003.reset()
         pm_values = pms5003.read()
         values["P2"] = str(pm_values.pm_ug_per_m3(2.5))
@@ -118,36 +125,59 @@ def send_to_luftdaten(values, id):
     pm_values_json = [{"value_type": key, "value": val} for key, val in pm_values.items()]
     temp_values_json = [{"value_type": key, "value": val} for key, val in temp_values.items()]
 
-    resp_1 = requests.post(
-        "https://api.luftdaten.info/v1/push-sensor-data/",
-        json={
-            "software_version": "enviro-plus 0.0.1",
-            "sensordatavalues": pm_values_json
-        },
-        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": temp_values_json
-        },
-        headers={
-            "X-PIN": "11",
-            "X-Sensor": id,
-            "Content-Type": "application/json",
-            "cache-control": "no-cache"
-        }
-    )
-
-    if resp_1.ok and resp_2.ok:
-        return True
+    resp_pm = None
+    resp_bmp = None
+    
+    try:
+        resp_pm = requests.post(
+            "https://api.luftdaten.info/v1/push-sensor-data/",
+            json={
+                "software_version": "enviro-plus 0.0.1",
+                "sensordatavalues": pm_values_json
+            },
+            headers={
+                "X-PIN": "1",
+                "X-Sensor": id,
+                "Content-Type": "application/json",
+                "cache-control": "no-cache"
+            },
+            timeout=5
+        )
+    except requests.exceptions.ConnectionError as e:
+        logging.warning('Luftdaten PM Connection Error: {}'.format(e))
+    except requests.exceptions.Timeout as e:
+        logging.warning('Luftdaten PM Timeout Error: {}'.format(e))
+    except requests.exceptions.RequestException as e:
+        logging.warning('Luftdaten PM Request Error: {}'.format(e))
+
+    try:        
+        resp_bmp = requests.post(
+            "https://api.luftdaten.info/v1/push-sensor-data/",
+            json={
+                "software_version": "enviro-plus 0.0.1",
+                "sensordatavalues": temp_values_json
+            },
+            headers={
+                "X-PIN": "11",
+                "X-Sensor": id,
+                "Content-Type": "application/json",
+                "cache-control": "no-cache"
+            },
+            timeout=5
+        )
+    except requests.exceptions.ConnectionError as e:
+        logging.warning('Luftdaten Climate Connection Error: {}'.format(e))
+    except requests.exceptions.Timeout as e:
+        logging.warning('Luftdaten Climate Timeout Error: {}'.format(e))
+    except requests.exceptions.RequestException as e:
+        logging.warning('Luftdaten Climate Request Error: {}'.format(e))
+
+    if resp_pm is not None and resp_bmp is not None:
+        if resp_pm.ok and resp_bmp.ok:
+            return True
+        else:
+            logging.warning('Luftdaten Error. PM: {}, Climate: {}'.format(resp_pm.reason, resp_bmp.reason))
+            return False
     else:
         return False
 
@@ -166,23 +196,25 @@ def send_to_luftdaten(values, id):
 font_size = 16
 font = ImageFont.truetype(UserFont, 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"))
+# Log Raspberry Pi serial and Wi-Fi status
+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)
+        time_since_update = time.time() - update_time
         if time_since_update > 145:
-            resp = send_to_luftdaten(values, id)
+            logging.info(values)
             update_time = time.time()
-            print("Response: {}\n".format("ok" if resp else "failed"))
+            if send_to_luftdaten(values, id):
+                logging.info("Luftdaten Response: OK")
+            else:
+                logging.warning("Luftdaten Response: Failed")
         display_status()
     except Exception as e:
-        print(e)
+        logging.warning('Main Loop Exception: {}'.format(e))