Merge branch 'master' of rvb.name:weathermon

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index 20f5aca9fa194d32e9a1b9d128dfa65d86a43ffc..3e940cd8b89baa0962c1cde14284305fa894a8f2 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -10,16 +10,54 @@ function getConfig()
   web_user = cur.get(config,"web","user")
   web_pass = cur.get(config,"web","password")
   web_devid = cur.get(config,"web","devid")
   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 not web_devid then

   
   

-  io.input("/sys/class/net/eth0/address")
-  mac = io.read("*line")
-  mac = mac:gsub(":","")
-  mac = mac:upper()
+    if web_iface then
+      io.input("/sys/class/net/"..web_iface.."/address")
+    else
+      io.input("/sys/class/net/eth0/address")
+    end

 
 

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

 
   logging = cur.get(config,"logging","enabled") 
 
 
   logging = cur.get(config,"logging","enabled") 
 

+  serial_port = cur.get(config,"serial","port")
+  serial_baud = cur.get(config,"serial","baud")
+
+  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
 
 require "socket"
 end
 
 require "socket"


@@ -59,21 +97,21 @@ end
 
 function submitValue(type,id,param,val)
 
 
 function submitValue(type,id,param,val)
 

-  printLog("URL="..web_url)
-

   url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
 
   url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
 

-  printLog(url)
-

   command = "curl"
 
   command = "curl"
 

+  if web_iface then
+    command = command.." --interface "..web_iface
+  end
+

   if web_user then
     command = command.." -u "..web_user..":"..web_pass
   end
 
   command = command.." \""..url.."\""
 
   if web_user then
     command = command.." -u "..web_user..":"..web_pass
   end
 
   command = command.." \""..url.."\""
 

-  printLog("COMMAND=\""..command.."\"")
+  print(command)

   os.execute(command)
   print("")
 
   os.execute(command)
   print("")
 


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

+    mqtt_param = {}

     for k,v in pairs(sensor) do
     for k,v in pairs(sensor) do

-      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..key..", Value = "..value)
-      submitValue(sensor_type,sensor_id,key,value)
+      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
 


@@ -119,6 +164,16 @@ end
 
 getConfig()
 
 
 getConfig()
 

-line=arg[1]
-print(line)
-processLine(line)
+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()
+  print(line)
+  processLine(line)
+end