From 81a276ab7840d6f9c64da80fe5d3bad88fb99b83 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Thu, 15 Oct 2015 19:24:05 +0200
Subject: wip

---
 diller/main.lua | 87 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

(limited to 'diller/main.lua')

diff --git a/diller/main.lua b/diller/main.lua
index eca88a9..f982f8c 100644
--- a/diller/main.lua
+++ b/diller/main.lua
@@ -11,7 +11,7 @@ local mq = require('mq')
 
 local function on_cmd(cmd, args)
   if not cmd then
-	return
+    return
   end
 
   print("on_cmd: '"..cmd.."', #args="..tostring(table.getn(args)))
@@ -20,57 +20,57 @@ local function on_cmd(cmd, args)
   end
 
   if cmd == "reset" then
-	print("ok")
+  print("ok")
     panic("Reset requested")
   elseif cmd == "wlan" then
-	local ssid = args.ssid password = args.password
+    local ssid = args.ssid password = args.password
 
-	if args.ssid then
-	  wifi.sta.config(args.ssid, args.password, 1)
-	end
-	ssid, password, bssid_set, bssid = wifi.sta.getconfig()
-	print("ok ssid="..(ssid or ''))
+    if args.ssid then
+      wifi.sta.config(args.ssid, args.password, 1)
+    end
+    ssid, password, bssid_set, bssid = wifi.sta.getconfig()
+    print("ok ssid="..(ssid or ''))
   elseif cmd == "network" then
-	local ip = args.ip nm = args.netmask gw = args.gateway
+    local ip = args.ip nm = args.netmask gw = args.gateway
 
-	if args.ip then
-	  wifi.sta.setip({ip=ip, netmask=nm, gateway=gw})
-	end
+    if args.ip then
+      wifi.sta.setip({ip=ip, netmask=nm, gateway=gw})
+    end
 
-	ip, nm, gw = wifi.sta.getip()
-	print("ok ip="..(ip or '').." netmask="..(nm or '').." gateway="..(gw or ''))
+    ip, nm, gw = wifi.sta.getip()
+    print("ok ip="..(ip or '').." netmask="..(nm or '').." gateway="..(gw or ''))
   elseif cmd == "set-property" then
-	local id = args.id
-	if not id then
-	  print("fail status=missing-id")
-	else
-	  local name_path = id.."/name"
-	  mq.subscribe(name_path, function() print('message on '..path) end)
-
-	  local description_path = id.."/description"
-	  mq.subscribe(description_path, function() print('message on '..path) end)
-
-	  if args.value then
-	    local path = id.."/value"
-		mq.publish(path, args.value)
-	  end
-	  if args.name then
-		mq.publish(name_path, args.name)
-	  end
-	  if args.description then
-		mq.publish(description_path, args.description)
-	  end
-	end
+    local id = args.id
+    if not id then
+      print("fail status=missing-id")
+    else
+      local name_path = id.."/name"
+      mq.subscribe(name_path, function() print('message on '..path) end)
+
+      local description_path = id.."/description"
+      mq.subscribe(description_path, function() print('message on '..path) end)
+
+      if args.value then
+        local path = id.."/value"
+        mq.publish(path, args.value)
+      end
+      if args.name then
+        mq.publish(name_path, args.name)
+      end
+      if args.description then
+        mq.publish(description_path, args.description)
+      end
+    end
   elseif cmd == "publish" then
 --    print("Publishing, topic="..tostring(cmd.topic)..", payload="..tostring(cmd.payload))
-	ok, msg = mq.publish(cmd.topic, cmd.payload)
+    ok, msg = mq.publish(cmd.topic, cmd.payload)
     if ok then
-	  print("ok status="..msg)
-	else
-	  print("failed status="..msg)
-	end	  
+      print("ok status="..msg)
+    else
+      print("failed status="..msg)
+    end
   else
-	print("failed status=unknown-command")
+    print("failed status=unknown-command")
   end
 end
 
@@ -114,8 +114,9 @@ function P.main()
   wifi.setmode(wifi.STATION)
   wifi.sta.config(wlan_ssid, wlan_password)
 
-  local client_id = "esp8266-"..wifi.sta.getmac()
-  mq.init(timers.mqtt, client_id)
+  local mac = wifi.sta.getmac()
+  local client_id = "esp8266-"..mac
+  mq.init(timers.mqtt, mac, client_id)
 
   inter.init(on_cmd)
 
-- 
cgit v1.2.3