Добавлена начальная поддержка MQTT

diff --git a/weathermon.lua b/weathermon.lua
index 19cd912b13ffa8612f36eea9fdba9c71c43c4aa4..3e940cd8b89baa0962c1cde14284305fa894a8f2 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -12,25 +12,51 @@ function getConfig()
   web_devid = cur.get(config,"web","devid")
 
   web_iface = cur.get(config,"web","iface")
   web_devid = cur.get(config,"web","devid")
 
   web_iface = cur.get(config,"web","iface")

+
+  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
+    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()

 
 

-  mac = io.read("*line")
-  mac = mac:gsub(":","")
-  mac = mac:upper()
+    web_devid = mac
+
+  end

 
 

-  web_devid = web_devid or mac

   logging = cur.get(config,"logging","enabled") 
 
   serial_port = cur.get(config,"serial","port")
   serial_baud = cur.get(config,"serial","baud")
 
   logging = cur.get(config,"logging","enabled") 
 
   serial_port = cur.get(config,"serial","port")
   serial_baud = cur.get(config,"serial","baud")
 

-  command = "stty -F  "..serial_port.." "..serial_baud
-  os.execute(command)
+  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")
+
+  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/'..web_devid
+  end

 
 end
 
 
 end
 


@@ -121,9 +147,16 @@ function processLine(str)
         end
       end
     end
         end
       end
     end

+    mqtt_param = {}

     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)
     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)

+      mqtt_param[k]=v
+    end
+    mqtt_msg = { type=sensor_type, data=mqtt_param }
+    if mqtt_client then
+      serializedString = json.encode(mqtt_msg)
+      mqtt_client:publish(mqtt_topic,serializedString)

     end
   end
 
     end
   end
 


@@ -131,6 +164,13 @@ end
 
 getConfig()
 
 
 getConfig()
 

+if mqtt_host then
+  MQTT = require "paho.mqtt"
+  mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)
+  mqtt_client:connect(mqtt_id)
+  json = require( "json" )
+end
+

 serialin=io.open(serial_port,"r")
 while 1 do
   line=serialin:read()
 serialin=io.open(serial_port,"r")
 while 1 do
   line=serialin:read()

diff --git a/weathermon.uci b/weathermon.uci
index 27631ac5a8d8978c4b0af25586e1222a1b8a66a5..6c2f6e45e63125873cf8652f9be7de14fbe45787 100644 (file)
--- a/weathermon.uci
+++ b/weathermon.uci
@@ -1,5 +1,5 @@
 config internal 'web'
 config internal 'web'

-       option url http://estia.rvb-home.lan/meteo/send.php
+       option url http://server/path/send.php

        option user meteo
        option password somestrictpassword
        option iface eth0
        option user meteo
        option password somestrictpassword
        option iface eth0


@@ -11,3 +11,6 @@ config internal 'serial'
 
 config internal 'logging'
        option enabled on
 
 config internal 'logging'
        option enabled on

+
+config internal 'mqtt'
+        option host server