From: Roman Bazalevsky Date: Tue, 27 Sep 2016 12:07:21 +0000 (+0300) Subject: Подчистка X-Git-Url: https://git.rvb.name/weathermon.git/commitdiff_plain/6973d6067a55500a0d7d8868357decd72f24a73c?ds=sidebyside;hp=8535e6a1afa35ae008854c6f494470126da9cd7e Подчистка --- diff --git a/filter_sensors.py b/filter_sensors.py new file mode 100644 index 0000000..6a0a11c --- /dev/null +++ b/filter_sensors.py @@ -0,0 +1,131 @@ +#!/usr/bin/python + +import MySQLdb +import ConfigParser +import sys + +from pprint import pprint +import datetime + +import numpy as np + +import scipy.signal + +global database + +def GetTables(name): + if database: + c = database.cursor() + c.execute("SELECT * FROM Items WHERE ItemName like %s",[name]) + return c.fetchall() + else: + print "No connection to DB" + exit() + +def Today(): + dt = datetime.datetime.now() + d_truncated = datetime.date(dt.year, dt.month, dt.day) + return d_truncated + +def Tomorrow(): + dt = Today() + return dt + datetime.timedelta(days=1) + +def Yesterday(): + dt = Today() + return dt - datetime.timedelta(days=1) + +def GetData(id,fromDate=Yesterday(),toDate=Today()): + if database: + c = database.cursor() + c.execute("SELECT * FROM Item"+str(id).strip()+" WHERE Time>=%s AND Time<%s",[fromDate.strftime('%Y-%m-%d %H:%M:%S'),toDate.strftime('%Y-%m-%d %H:%M:%S')]) + return c.fetchall() + else: + print "No connection to DB" + exit() + +def FixRecord(id,date,value): + if database: + c = database.cursor() + command="UPDATE Item"+str(id).strip()+" SET Value={} WHERE Time='{}'".format(value,date.strftime('%Y-%m-%d %H:%M:%S')) + print command + c.execute(command) + else: + print "No connection to DB" + exit() + +def ProcessTable(id): + + if not current: + data=GetData(id) + else: + data=GetData(id,Today(),Tomorrow()) + sTime=[] + sValue=[] + for rec in data: + sTime.append(rec[0]) + sValue.append(rec[1]) + sValue=np.array(sValue) + + sValueFilt=scipy.signal.medfilt(sValue,5) + + sValueDiff=abs(sValue-sValueFilt) + + avg=np.mean(sValueDiff) + + for i in range(0,len(sTime)-1): + if sValueDiff[i]>avg*filterThreshold: + print "fixing %s : %5.2f %5.2f %5.2f" % (sTime[i],sValue[i],sValueFilt[i],sValueDiff[i]) + FixRecord(id,sTime[i],sValueFilt[i]) + + database.commit() + +if len(sys.argv)==2 and sys.argv[1]=='current': + current=True +else: + current=False + + +try: + + cfg = ConfigParser.RawConfigParser(allow_no_value=True) + cfg.readfp(open('/etc/openhab-db.conf')) + dbhost = cfg.get("mysql","host") + dbuser = cfg.get("mysql","user") + dbpasswd = cfg.get("mysql","passwd") + dbdb = cfg.get("mysql","db") + + itemTemplate = cfg.get("openhab","template") + + filterWindow = int(cfg.get("filter","window")) + filterThreshold = float(cfg.get("filter","threshold")) + +except: + + print "Error reading configuration file" + exit() + +try: + + database = MySQLdb.connect(host=dbhost,user=dbuser,passwd=dbpasswd,db=dbdb,use_unicode=True) + database.set_character_set('utf8') + c = database.cursor() + c.execute('SET NAMES utf8;') + + print "Connected..." + +except: + + print "Error connecting database" + exit() + +tables = GetTables(itemTemplate) + +for id,name in tables: + + print "Processing: "+name + + ProcessTable(id) + +print "Processed " + \ No newline at end of file diff --git a/weathermon.conf~ b/weathermon.conf~ new file mode 100644 index 0000000..164a1ee --- /dev/null +++ b/weathermon.conf~ @@ -0,0 +1,17 @@ +[mysql] +host = estia.rvb-home.lan +user = meteo +passwd = snovadozhdi +[serial] +port = /dev/ttyATH0 +[openweathermap] +user = rvbglas +passwd = gdetotamdaleko +temp = OUTDOOR.44F.TEMPERATURE +pres = BARO.DEFAULT.PRESSURE +humi = OUTDOOR.44F.HUMIDITY +lat = 55.403266 +lon = 37.561651 +station = rvb.name +[logging] +enabled=on diff --git a/weathermon.lua b/weathermon.lua index f2b584b..e4fa370 100755 --- a/weathermon.lua +++ b/weathermon.lua @@ -250,7 +250,6 @@ if mqtt_host then mqtt_client:auth(mqtt_user, mqtt_passwd) end mqtt_client:connect(mqtt_id) - json = require( "json" ) end if serial_port then diff --git a/weathermon.lua~ b/weathermon.lua~ new file mode 100755 index 0000000..f2b584b --- /dev/null +++ b/weathermon.lua~ @@ -0,0 +1,273 @@ +#!/usr/bin/lua + +function getConfig() + + local uci=require("uci") + local cur=uci.cursor() + local config="weathermon" + + web_url = cur.get(config,"web","url") + web_user = cur.get(config,"web","user") + web_pass = cur.get(config,"web","password") + web_devid = cur.get(config,"web","devid") + + web_iface = cur.get(config,"web","iface") + + if web_iface then + + command = '/sbin/ifconfig '..web_iface..' | grep \'\\\' | sed -n \'1p\' | tr -s \' \' | cut -d \' \' -f3 | cut -d \':\' -f2' + f=io.popen(command,'r') + ip_addr=f:read() + + end + + if not web_devid then + + if web_iface then + io.input("/sys/class/net/"..web_iface.."/address") + else + io.input("/sys/class/net/eth0/address") + end + + mac = io.read("*line") + mac = mac:gsub(":","") + mac = mac:upper() + + web_devid = mac + + end + + logging = cur.get(config,"logging","enabled") + + serial_port = cur.get(config,"serial","port") + serial_baud = cur.get(config,"serial","baud") + + input_file = cur.get(config,"input","file") + input_exec = cur.get(config,"input","exec") + alarm_exec = cur.get(config,"alarm","exec") + + if serial_port then + + command = "stty -F "..serial_port.." "..serial_baud + os.execute(command) + + end + + mqtt_host = cur.get(config,"mqtt","host") + mqtt_port = cur.get(config,"mqtt","port") + mqtt_id = cur.get(config,"mqtt","id") + mqtt_topic = cur.get(config,"mqtt","topic") + mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic") + + mqtt_user = cur.get(config,"mqtt","user") + mqtt_passwd = cur.get(config,"mqtt","password") + + if mqtt_host and not mqtt_id then + mqtt_id="weather-"..web_devid + end + + if mqtt_host and not mqtt_port then + mqtt_port = 1883 + end + + if mqtt_host and not mqtt_topic then + mqtt_topic = 'weathermon/{dev}/{type}/{id}/{param}' + end + + if mqtt_host and not mqtt_alarm_topic then + mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}' + end + +end + +require "socket" + +function sleep(sec) + socket.select(nil, nil, sec) +end + +function splitStr(str,char) + + local res = {} + local idx = 1 + + + while str:len()>0 do + pos = str:find(char); + if pos == nil then + res[idx]=str + str="" + else + res[idx]=str:sub(1,pos-1) + idx=idx+1 + str=str:sub(pos+1) + end + end + + return res + +end + +function printLog(str) + print(str) + if logging=="on" then + os.execute("logger -t weathermon "..str) + end +end + +function submitValue(type,id,param,val) + + url = web_url.."?stype="..type.."&sid="..id.."¶m="..param.."&value="..val + + command = "curl" + + if web_iface then + command = command.." --interface "..ip_addr + end + + if web_user then + command = command.." -u "..web_user..":"..web_pass + end + + command = command.." \""..url.."\"" + + os.execute(command) + print() + +end + +function processLine(str) + + msg=splitStr(line,':') + msg_type=msg[1] or '' + msg_body=msg[2] or '' + if msg_type=="STATUS" then + printLog("Status: "..msg_body) + elseif msg_type=="ERROR" then + printLog("Error: "..msg_body) + elseif msg_type=="SENSOR" then + printLog("SENSOR: "..msg_body) + sens = splitStr(msg_body,",") + sensor = {} + idx = 1 + sensor_type = nil + sensor_id = web_devid + for i,rec in ipairs(sens) do + recrd=splitStr(rec,'=') + key=recrd[1] or '' + value=recrd[2] or '' + if value then + if key=="TYPE" then + sensor_type=value + elseif key=="ID" then + sensor_id=value + else + sensor[key]=value + end + end + end + if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then + for k,v in pairs(sensor) do + printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v) + submitValue(sensor_type,sensor_id,k,v) + if mqtt_client then + mqtt_path=string.gsub(mqtt_topic,"{(.-)}", + function (name) + if name=="dev" then + return web_devid + elseif name=="type" then + return sensor_type + elseif name=="id" then + return sensor_id + elseif name=="param" then + return k + else + return '{'..name..'}' + end + end) + mqtt_client:publish(mqtt_path,v) + end + end + else + printLog("Cannot parse sensor input: "..msg_body) + end + elseif msg_type=="ALARM" then + printLog("ALARM: "..msg_body) + sens = splitStr(msg_body,",") + sensor = {} + idx = 1 + sensor_type = nil + sensor_id = web_devid + mqtt_param = {} + for i,rec in ipairs(sens) do + recrd=splitStr(rec,'=') + key=recrd[1] or '' + value=recrd[2] or '' + if value then + if key=="TYPE" then + alarm_type=value + elseif key=="ID" then + alarm_id=value + end + end + end + if not (alarm_type==nil or alarm_id==nil or alarm_type=='' or alarm_id=='') then + if mqtt_client then + mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", + function (name) + if name=="dev" then + return web_devid + elseif name=="type" then + return sensor_type + elseif name=="id" then + return sensor_id + else + return '{'..name..'}' + end + end) + mqtt_client:publish(mqtt_path,msg_body) + end + if alarm_exec then + command=alarm_exec.. + " \""..string.gsub(alarm_type,"\"","\\\"").. + "\" \""..string.gsub(alarm_id,"\"","\\\"").. + "\" \""..string.gsub(msg_body,"\"","\\\"").."\"" + os.execute(command) + end + else + printLog("Cannot parse alarm input: "..msg_body) + end + end + +end + +getConfig() + +if mqtt_host then + MQTT = require "paho.mqtt" + mqtt_client = MQTT.client.create(mqtt_host, mqtt_port) + if mqtt_user then + mqtt_client:auth(mqtt_user, mqtt_passwd) + end + mqtt_client:connect(mqtt_id) + json = require( "json" ) +end + +if serial_port then + serialin=io.open(serial_port,"r") +elseif input_file == "-" then + serialin=io.stdin; +elseif input_file then + serialin=io.open(input_file,"r") +elseif input_exec then + serialin=io.popen(input_exec,"r") +else + printLog("No input selected") + return +end +while 1 do + line=serialin:read() + print(line) + processLine(line) +end +