Add configuration file and fix some issues

Author: corny

.gitignore

@@ -87,3 +87,5 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+/config.yml

README.md

@@ -2,20 +2,37 @@
 
 Python 3 program for the luftdaten.info sensor network.
 
+
 ## Supported Hardware
 
 * [Nova Fitness SDS011](http://aqicn.org/sensor/sds011/) or compatible connected via `ttyUSB` for dust
 * [Bosch BME 2280](https://www.bosch-sensortec.com/bst/products/all_products/bme280) connected via I²C for temperature, humidity and pressure
 
+
 ## Used libraries
 
 * https://gitlab.com/frankrich/sds011_particle_sensor
 * https://github.com/adafruit/Adafruit_Python_BME280
 
+
 ## Dependencies
 
-    apt install python3-numpy python3-requests
+    apt install python3-numpy python3-requests python3-yaml python3-serial
+
+You also need to install [Adafruit_Python_BME280](https://github.com/adafruit/Adafruit_Python_BME280):
+
+    apt-get update
+    apt-get install build-essential python-pip python-dev python-smbus git
+    git clone https://github.com/adafruit/Adafruit_Python_GPIO.git
+    cd Adafruit_Python_GPIO
+    python3 setup.py install
+
+
+## Configuration
+
+Copy the `config.yml.default` to `config.yml` and adjust the settings.
+
 
-## To-Do
+## Running a systemd unit
 
-* submit data to luftdaten.info
+Take a look at the [dusty.unit](contrib/dusty.unit).

config.yml.default

@@ -0,0 +1,10 @@
+luftdaten:
+  enabled: true
+  sensor:  raspi-0000000000abcdef
+
+influxdb:
+  enabled:  false
+  url:      'http://example.com:8086/write?precision=s&db=sensors'
+  username: 'sensors'
+  password: 'secret'
+  node:     'esp8266-123456'

contrib/dusty.unit

@@ -0,0 +1,14 @@
+# /etc/systemd/system/dusty.service
+
+[Unit]
+Description=Dusty
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+User=dusty
+WorkingDirectoy=/home/dusty/python
+ExecStart=/home/dusty/python/main.py
+
+[Install]
+WantedBy=multi-user.target

main.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python3
 
 import sys
+import os
+import yaml
 
 # Import-Pfade setzen
-sys.path.append("sds011")
-sys.path.append("bme280")
+sys.path.append(os.path.join(sys.path[0],"sds011"))
+sys.path.append(os.path.join(sys.path[0],"bme280"))
 
 import time
 import json
@@ -13,10 +15,13 @@
 from sds011 import SDS011
 from Adafruit_BME280 import *
 
-# Logger initialisieren
-#import logging
-#logger = logging.getLogger()
-#logger.setLevel(logging.INFO)
+# Config
+with open("config.yml", 'r') as ymlfile:
+    config = yaml.load(ymlfile)
+
+# Logging
+import logging
+logging.basicConfig(level=logging.DEBUG)
 
 bme280 = BME280(
     address=0x76,
@@ -34,33 +39,93 @@
 # Set dutycyle to nocycle (permanent)
 dusty.dutycycle = 0
 
+class Measurement:
+    def __init__(self):
+        pm25_values = []
+        pm10_values = []
+        dusty.workstate = SDS011.WorkStates.Measuring
+        try:
+            for a in range(8):
+                values = dusty.get_values()
+                if values is not None:
+                    pm10_values.append(values[0])
+                    pm25_values.append(values[1])
+        finally:
+            dusty.workstate = SDS011.WorkStates.Sleeping
+
+        self.pm25_value  = np.mean(pm25_values)
+        self.pm10_value  = np.mean(pm10_values)
+        self.temperature = bme280.read_temperature()
+        self.humidity    = bme280.read_humidity()
+        self.pressure    = bme280.read_pressure()
+
+    def sendInflux(self):
+        cfg = config['influxdb']
+
+        if not cfg['enabled']:
+            return
+
+        data = "feinstaub,node={} SDS_P1={:0.2f},SDS_P2={:0.2f},BME280_temperature={:0.2f},BME280_pressure={:0.2f},BME280_humidity={:0.2f}".format(
+            cfg['node'],
+            self.pm10_value,
+            self.pm25_value,
+            self.temperature,
+            self.pressure,
+            self.humidity,
+        )
+
+        requests.post(cfg['url'],
+            auth=(cfg['username'], cfg['password']),
+            data=data,
+        )
+
+    def sendLuftdaten(self):
+        if not config['luftdaten']['enabled']:
+            return
+
+        self.__pushLuftdaten('https://api-rrd.madavi.de/data.php', 0, {
+            "SDS_P1":             self.pm10_value,
+            "SDS_P2":             self.pm25_value,
+            "BME280_temperature": self.temperature,
+            "BME280_pressure":    self.pressure,
+            "BME280_humidity":    self.humidity,
+        })
+        self.__pushLuftdaten('https://api.luftdaten.info/v1/push-sensor-data/', 1, {
+            "P1": self.pm10_value,
+            "P2": self.pm25_value,
+        })
+        self.__pushLuftdaten('https://api.luftdaten.info/v1/push-sensor-data/', 11, {
+            "temperature": self.temperature,
+            "pressure":    self.pressure,
+            "humidity":    self.humidity,
+        })
+
+
+    def __pushLuftdaten(self, url, pin, values):
+        requests.post(url,
+            json={
+                "software_version": "python-dusty 0.0.1",
+                "sensordatavalues": [{"value_type": key, "value": val} for key, val in values.items()],
+            },
+            headers={
+                "X-PIN":    str(pin),
+                "X-Sensor": config['luftdaten']['sensor'],
+            }
+        )
+
+
 
 def run():
-    pm25_values = []
-    pm10_values = []
-    dusty.workstate = SDS011.WorkStates.Measuring
-    try:
-        for a in range(8):
-            values = dusty.get_values()
-            if values is not None:
-                pm10_values.append(values[0])
-                pm25_values.append(values[1])
-    finally:
-        dusty.workstate = SDS011.WorkStates.Sleeping
-
-    pm25_value = np.mean(pm25_values)
-    pm10_value = np.mean(pm10_values)
-
-    print('pm2.5     = {:f} '.format(pm25_value))
-    print('pm10      = {:f} '.format(pm10_value))
-
-    temperature = bme280.read_temperature()
-    humidity    = bme280.read_humidity()
-    pressure    = bme280.read_pressure()
-
-    print('Temp      = {:0.2f} deg C'.format(temperature))
-    print('Humidity  = {:0.2f} %'.format(humidity))
-    print('Pressure  = {:0.2f} hPa'.format(pressure/100))
+    m = Measurement()
+
+    print('pm2.5     = {:f} '.format(m.pm25_value))
+    print('pm10      = {:f} '.format(m.pm10_value))
+    print('Temp      = {:0.2f} deg C'.format(m.temperature))
+    print('Humidity  = {:0.2f} %'.format(m.humidity))
+    print('Pressure  = {:0.2f} hPa'.format(m.pressure/100))
+
+    m.sendLuftdaten()
+    m.sendInflux()
 
 
 starttime = time.time()

sds011/sds011.py

@@ -55,7 +55,7 @@ class SDS011(object):
     Each serial message starts with 0xAA and ends with 0xAB.
     If the message will be send to the senor, the second byte is 0xB4, the 16th and 17th
     byte is 0xFF.
-    If it is a response of the sensor of a message sended before, the second byte of the response
+    If it is a response of the sensor of a message sent before, the second byte of the response
     is 0xC5. If its a response send automatic by the sensor in "Initiative" Report Mode,
     the second byte is 0xC0.
     The third byte is always the command byte except in response to a request command or a sensor
@@ -370,11 +370,14 @@ def __send(self, command, data):
         self.device.flush()
         if written_bytes != len(bytes_to_send):
             raise IOError("Not all bytes written")
-        logging.debug("Sended and flushed: %s", bytes_to_send)
+        logging.debug("Sent and flushed: %s", bytes_to_send)
         # proof the receive value
         received = self.__response(command)
         logging.debug("Received: %s", received)
 
+        if len(received) == 0:
+            raise ValueError("nothing received")
+
         # when no command or command is request command,
         # second byte has to be ReceiveByte
         if ((command is None or command == self.Command.Request) and
@@ -399,7 +402,7 @@ def __send(self, command, data):
 
     def __response(self, command=None):
         '''gets and proofs the response from the senor. Response can be
-        the response of a sended command or just the measured date while sensor
+        the response of a sent command or just the measured date while sensor
         is in reportmode Initiative'''
         # receive the response while listening serial input
         bytes_received = bytearray(1)
@@ -437,7 +440,7 @@ def __response(self, command=None):
             if bytes_received[2] != command.value:
                 raise IOError(
                     "Third byte of serial data {0} received is not belonging \
-                    to prior sended command {1}".format(bytes_received[2], command.name))
+                    to prior sent command {1}".format(bytes_received[2], command.name))
 
         if command is None or command is self.Command.Request:
             if bytes_received[1] is not self.__ReceiveByte: