MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Ver0.1.2, fix logic bug 

Detail:
When require lib before connect to ap, program will return nil but the table.
This commit is contained in:
Martin Han 2015-04-22 12:50:02 +08:00
parent 6eb5b9c874
commit 5bda87845f
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lua_modules/yeelink/yeelink_lib.lua
View File

@ -1,17 +1,12 @@
-- *************************************************************************** -- ***************************************************************************
-- Yeelink Updata Libiary -- Yeelink Updata Libiary Version 0.1.2
-- --
-- Written by Martin -- Written by Martin
-- but based on a script of zhouxu_o from bbs.nodemcu.com -- but based on a script of zhouxu_o from bbs.nodemcu.com
-- --
-- MIT license, http://opensource.org/licenses/MIT -- MIT license, http://opensource.org/licenses/MIT
-- *************************************************************************** -- ***************************************************************************
if wifi.sta.getip() == nil then
print("Please Connect WIFI First")
return nil
end
--==========================Module Part====================== --==========================Module Part======================
local moduleName = ... local moduleName = ...
@ -30,7 +25,23 @@ local debug = true --<<<<<<<<<<<<< Don't forget to "false" it before using
local sk=net.createConnection(net.TCP, 0) local sk=net.createConnection(net.TCP, 0)
local datapoint = 0 local datapoint = 0
--====DNS the yeelink ip advance(in order to save RAM)===== --====DNS the yeelink ip advance(in order to save RAM)=====
if wifi.sta.getip() == nil then
print("Please Connect WIFI First")
tmr.alarm(1,1000,1,function ()
if wifi.sta.getip() ~= nil then
tmr.stop(1)
sk:dns("api.yeelink.net",function(conn,ip)
dns=ip
print("DNS YEELINK OK... IP: "..dns)
end)
end
end)
end
sk:dns("api.yeelink.net",function(conn,ip) sk:dns("api.yeelink.net",function(conn,ip)
dns=ip dns=ip
@ -50,14 +61,32 @@ function M.init(_device, _sensor, _apikey)
sensor = tostring(_sensor) sensor = tostring(_sensor)
apikey = _apikey apikey = _apikey
if dns == "0.0.0.0" then if dns == "0.0.0.0" then
tmr.alarm(2,5000,1,function ()
if dns == "0.0.0.0" then
print("Waiting for DNS...")
end
end)
return false return false
else else
return dns return dns
end end
end
--========Check the DNS Status===========
--if DNS success, return the address(string)
--if DNS fail(or processing), return nil
--
--
--========================================
function M.getDNS()
if dns == "0.0.0.0" then
return nil
else
return dns
end
end end
--=====Update to Yeelink Sever(At least 10s per sencods))===== --=====Update to Yeelink Sever(At least 10s per sencods))=====
-- datapoint->number -- datapoint->number
-- --