Merge branch 'master' of estia:weathermon

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index 20f5aca9fa194d32e9a1b9d128dfa65d86a43ffc..19cd912b13ffa8612f36eea9fdba9c71c43c4aa4 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -10,16 +10,28 @@ 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")

   
   

-  io.input("/sys/class/net/eth0/address")
+  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()
 
   web_devid = web_devid or mac
   mac = io.read("*line")
   mac = mac:gsub(":","")
   mac = mac:upper()
 
   web_devid = web_devid or mac

-

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

 end
 
 require "socket"
 end
 
 require "socket"


@@ -59,21 +71,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("")
 


@@ -110,8 +122,8 @@ function processLine(str)
       end
     end
     for k,v in pairs(sensor) do
       end
     end
     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)

     end
   end
 
     end
   end
 


@@ -119,6 +131,9 @@ end
 
 getConfig()
 
 
 getConfig()
 

-line=arg[1]
-print(line)
-processLine(line)
+serialin=io.open(serial_port,"r")
+while 1 do
+  line=serialin:read()
+  print(line)
+  processLine(line)
+end