From 299b29f352765c8fa399aea6157f62356ef036e8 Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Fri, 21 Oct 2016 16:16:03 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0?= =?utf8?q?=20JSON=20=D0=BD=D0=B0=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B5=20=D0=B4?= =?utf8?q?=D0=BB=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?utf8?q?=D1=81=D1=82=D0=B8=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20?= =?utf8?q?=D1=81=20mainline-=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B5=D0=B9=20r?= =?utf8?q?tl433,=20=D0=B2=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20?= =?utf8?q?=D0=BF=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB=D0=B0=D1=81=D1=8C=20=D0=BF?= =?utf8?q?=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B0=20=D0=BD=D1=83?= =?utf8?q?=D0=B6=D0=BD=D1=8B=D1=85=20=D0=BC=D0=B5=D1=82=D0=B5=D0=BE=D0=B4?= =?utf8?q?=D0=B0=D1=82=D1=87=D0=B8=D0=BA=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- weathermon.lua | 111 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 98 insertions(+), 13 deletions(-) diff --git a/weathermon.lua b/weathermon.lua index e4fa370..7a366b0 100755 --- a/weathermon.lua +++ b/weathermon.lua @@ -1,10 +1,44 @@ #!/usr/bin/lua -function getConfig() +require("json") +require("socket") + +function startswith(String,Start) + if String then + return string.sub(String,1,string.len(Start))==Start + else + return False + end +end + +function url_encode(str) + if (str) then + str = string.gsub (str, "\n", "\r\n") + str = string.gsub (str, "([^%w %-%_%.%~])", + function (c) return string.format ("%%%02X", string.byte(c)) end) + str = string.gsub (str, " ", "+") + end + return str +end + +function mqtt_encode(str) + if (str) then + str = string.gsub (str, "\n", "") + str = string.gsub (str, "/", "-") + end + return str +end + +function getConfig(configname) local uci=require("uci") local cur=uci.cursor() - local config="weathermon" + local config + if configname then + config=configname + else + config="weathermon" + end web_url = cur.get(config,"web","url") web_user = cur.get(config,"web","user") @@ -49,7 +83,7 @@ function getConfig() if serial_port then command = "stty -F "..serial_port.." "..serial_baud - os.execute(command) + os.capture(command) end @@ -80,8 +114,6 @@ function getConfig() end -require "socket" - function sleep(sec) socket.select(nil, nil, sec) end @@ -91,7 +123,6 @@ function splitStr(str,char) local res = {} local idx = 1 - while str:len()>0 do pos = str:find(char); if pos == nil then @@ -109,15 +140,16 @@ function splitStr(str,char) end function printLog(str) - print(str) if logging=="on" then os.execute("logger -t weathermon "..str) + else + print(str) end end function submitValue(type,id,param,val) - url = web_url.."?stype="..type.."&sid="..id.."¶m="..param.."&value="..val + url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."¶m="..url_encode(param).."&value="..url_encode(val) command = "curl" @@ -132,7 +164,54 @@ function submitValue(type,id,param,val) command = command.." \""..url.."\"" os.execute(command) - print() + +end + +function processJson(str) + + msg=json.decode(str) + + sensor={} + + for key,value in pairs(msg) do + if value then + if key=="model" then + sensor_type=value + elseif key=="id" then + sensor_id=value + elseif key=='time' then + sensor_time=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 mqtt_encode(web_devid) + elseif name=="type" then + return mqtt_encode(sensor_type) + elseif name=="id" then + return mqtt_encode(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 end @@ -241,7 +320,7 @@ function processLine(str) end -getConfig() +getConfig(arg[1]) if mqtt_host then MQTT = require "paho.mqtt" @@ -266,7 +345,13 @@ else end while 1 do line=serialin:read() - print(line) - processLine(line) + if line == nil then + break + end + printLog("Received: "..line); + if startswith(line,'{') then + processJson(line) + else + processLine(line) + end end - -- 2.34.1