Добавлена обработка JSON на входе для возможности работы с mainline-версией rtl433...

diff --git a/weathermon.lua b/weathermon.lua
index e4fa3707cef3f534550911689aa73066e1283887..7a366b04f320e6a709b23ad2d8f7b26e1a5a1bf2 100755 (executable)
--- 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.."&param="..param.."&value="..val
+  url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..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
-