for datetime intervals, don't return lowest value (min()) but avg()

[chrisu/seepark.git] / seewasser.py

diff --git a/seewasser.py b/seewasser.py
index a17e794cf9b38da1992cdee5ab3fa14fb77469bf..ef7f401eeb8a29ec2ae869066879777cfc7bb770 100755 (executable)
--- a/seewasser.py
+++ b/seewasser.py
@@ -1,10 +1,14 @@
 #! /usr/bin/python3
 
 #! /usr/bin/python3
 

+import argparse
+import logging

 import datetime
 import re
 import sys
 import csv
 import os
 import datetime
 import re
 import sys
 import csv
 import os

+import configparser
+from sqlalchemy import create_engine

 
 #May 27 21:32 /sys/bus/w1/devices/28-0416a1bab9ff
 #May 27 21:33 /sys/bus/w1/devices/28-0416a1ac66ff
 
 #May 27 21:32 /sys/bus/w1/devices/28-0416a1bab9ff
 #May 27 21:33 /sys/bus/w1/devices/28-0416a1ac66ff


@@ -16,8 +20,12 @@ import os
 # einen Sensor auslesen
 #/sys/bus/w1/devices/
 
 # einen Sensor auslesen
 #/sys/bus/w1/devices/
 

-def readsensor(sensorID):
-    sensorfile = "/sys/bus/w1/devices/28-{}/w1_slave".format(sensorID)
+class ReadsensorError(RuntimeError):
+    pass
+    
+    
+def readsensor(sensor_id):
+    sensorfile = "/sys/bus/w1/devices/28-{}/w1_slave".format(sensor_id)

     file = open(sensorfile)
 
     # Inhalt des Sensors:
     file = open(sensorfile)
 
     # Inhalt des Sensors:


@@ -30,40 +38,59 @@ def readsensor(sensorID):
 
     yesno = match.group(1)
     if yesno != "YES":
 
     yesno = match.group(1)
     if yesno != "YES":

-        return None
+        raise ReadsensorError('Could not evaluate sensorfile "{}"'.format(sensorfile))

         
     # Temperatur raus
     linetemp = file.readline()
     match = re.search(" t=([-0-9]+)",linetemp)
 
         
     # Temperatur raus
     linetemp = file.readline()
     match = re.search(" t=([-0-9]+)",linetemp)
 

-    temp = match.group(1)
-    temp = float(temp)/1000
+    temp_raw = match.group(1)
+    temp = float(temp_raw)/1000

 
     file.close()
 
     file.close()

-

     jetzt = datetime.datetime.now()
     jetzt = datetime.datetime.now()

-    # print(jetzt)

 
 

+    return jetzt, temp_raw, temp
+
+
+def writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):

     # Schreiben des csv-files
     # Schreiben des csv-files

-    file2 = open("badesaison.csv", "a", newline = "")
-    writer = csv.writer(file2, dialect = "excel")
-    writer.writerow([jetzt.strftime("%Y-%m-%d %H:%M"), sensorID, "{:.1f}".format(temp)])
+    file = open(os.path.expanduser(config.get("csv", "filename")), "a", newline = "")
+    writer = csv.writer(file, dialect = "excel")
+    writer.writerow([timestamp.strftime("%Y-%m-%d %H:%M"), sensor_id, sensor_name, "{:.1f}".format(value)])
+
+    file.close()
+
+
+def writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value):
+    # Schreiben des db-files
+    user = config.get('database', 'user')
+    pwd = config.get('database','password')
+    host = config.get('database','hostname')
+    db = config.get('database','database')
+    
+    engine = create_engine('mysql+mysqldb://{}:{}@{}/{}'.format(user, pwd, host, db), echo=False)
+    conn = engine.connect()
+    conn.execute("insert into sensors (sensor_id, sensor_name, value_type, value_raw, value, timestamp) values (%s,%s,%s,%s,%s,%s)", sensor_id, sensor_name, value_type, value_raw, value, timestamp)
+    conn.close()

 
 

-    file2.close()

 
 

-    # Nur für die Ausgabe wird gerundet
-    return temp
+def main(configfile):
+    config = configparser.ConfigParser()
+    config.read(configfile)

     
     

-sensoren = ["0416a1bab9ff","0416a1ac66ff","0516a207a4ff","0316a2193bff","0316a21383ff"]
+    value_type = "Wassertemperatur"
+    for sensor_id, sensor_name in config.items('temperature'):
+        timestamp, value_raw, value = readsensor(sensor_id)
+        writesensordatacsv(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
+        writesensordatadb(config, sensor_id, sensor_name, timestamp, value_type, value_raw, value)
+        logging.info('Sensor {}: {:.1f}°C'.format(sensor_id, value))

 
 

-error = False

 
 

-for sensorID in sensoren:
-    temp = readsensor(sensorID)
-    if temp is None:
-        print("Fehler bei Sensor{}".format(sensorID))
-        error = True
-    else:
-        print('Sensor {}: {:.1f}°C'.format(sensorID,temp))
+if __name__ == '__main__':
+    default_config_file = os.path.expanduser('~/seewasser.ini')
+    parser = argparse.ArgumentParser(description='Read sensor data')
+    parser.add_argument('--config', default=default_config_file, help='configuration file')
+    args = parser.parse_args()
+    main(args.config)

 
 

-sys.exit(1 if error else 0)
\ No newline at end of file