1) Поддержка сигнализации на 433МГц.

2) Определение исходящего адреса в явном виде.

diff --git a/weathermon.lua b/weathermon.lua
index 3e940cd8b89baa0962c1cde14284305fa894a8f2..c97983058796ddaf275bcc6c9417d8d69b6da35a 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -13,6 +13,14 @@ function getConfig()
 
   web_iface = cur.get(config,"web","iface")
 
 
   web_iface = cur.get(config,"web","iface")
 

+  if web_iface then
+  
+    command = '/sbin/ifconfig '..web_iface..' | grep \'\\<inet\\>\' | 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
   if not web_devid then
   
     if web_iface then


@@ -34,6 +42,10 @@ function getConfig()
   serial_port = cur.get(config,"serial","port")
   serial_baud = cur.get(config,"serial","baud")
 
   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
   if serial_port then
 
     command = "stty -F  "..serial_port.." "..serial_baud


@@ -45,6 +57,7 @@ function getConfig()
   mqtt_port = cur.get(config,"mqtt","port")
   mqtt_id = cur.get(config,"mqtt","id")
   mqtt_topic = cur.get(config,"mqtt","topic")
   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")

 
   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid
 
   if mqtt_host and not mqtt_id then
     mqtt_id="weather-"..web_devid


@@ -58,6 +71,10 @@ function getConfig()
     mqtt_topic = 'weathermon/'..web_devid
   end
 
     mqtt_topic = 'weathermon/'..web_devid
   end
 

+  if mqtt_host and not mqtt_alarm_topic then
+    mqtt_alarm_topic = 'alarm/'..web_devid
+  end
+

 end
 
 require "socket"
 end
 
 require "socket"


@@ -102,7 +119,7 @@ function submitValue(type,id,param,val)
   command = "curl"
 
   if web_iface then
   command = "curl"
 
   if web_iface then

-    command = command.." --interface "..web_iface
+    command = command.." --interface "..ip_addr

   end
 
   if web_user then
   end
 
   if web_user then


@@ -111,9 +128,7 @@ function submitValue(type,id,param,val)
 
   command = command.." \""..url.."\""
 
 
   command = command.." \""..url.."\""
 

-  print(command)

   os.execute(command)
   os.execute(command)

-  print("")

 
 end
 
 
 end
 


@@ -153,11 +168,45 @@ function processLine(str)
       submitValue(sensor_type,sensor_id,k,v)
       mqtt_param[k]=v
     end
       submitValue(sensor_type,sensor_id,k,v)
       mqtt_param[k]=v
     end

-    mqtt_msg = { type=sensor_type, data=mqtt_param }
+    mqtt_msg = { type=sensor_type, id=sensor_id, data=mqtt_param }

     if mqtt_client then
       serializedString = json.encode(mqtt_msg)
       mqtt_client:publish(mqtt_topic,serializedString)
     end
     if mqtt_client then
       serializedString = json.encode(mqtt_msg)
       mqtt_client:publish(mqtt_topic,serializedString)
     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 nil
+      value=recrd[2] or nil
+      if value then
+        if key=="TYPE" then
+          alarm_type=value
+        elseif key=="ID" then
+          alarm_id=value
+        else
+          mqtt_param[key]=value
+        end
+      end
+    end
+    if mqtt_client then
+      mqtt_msg = { type = alarm_type, id = alarm_id, data = mqtt_param }
+      serializedString = json.encode(mqtt_msg)
+      mqtt_client:publish(mqtt_alarm_topic,serializedString)
+    end
+    if alarm_exec then
+      command=alarm_exec..
+        " \""..string.gsub(alarm_type,"\"","\\\"")..
+        "\" \""..string.gsub(alarm_id,"\"","\\\"")..
+        "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
+      os.execute(command)
+    end

   end
 
 end
   end
 
 end


@@ -171,7 +220,18 @@ if mqtt_host then
   json = require( "json" )
 end
 
   json = require( "json" )
 end
 

-serialin=io.open(serial_port,"r")
+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)
 while 1 do
   line=serialin:read()
   print(line)