From 72f60d3e5af7aa6c879ab95f60767145264b55f2 Mon Sep 17 00:00:00 2001
From: funshine <guijie.hong@gmail.com>
Date: Tue, 30 Dec 2014 20:17:16 +0800
Subject: [PATCH] rebuild bin, add setip, setmac, sleeptype api to wifi module,
 fix #62

---
 README.md                                     |   5 ++++-
 app/modules/wifi.c                            |   2 +-
 .../0.9.4/512k-flash/nodemcu_512k_latest.bin  | Bin 520192 -> 520192 bytes
 pre_build/latest/nodemcu_512k_latest.bin      | Bin 520192 -> 520192 bytes
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 234caeeb..9c2a6264 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,10 @@ Tencent QQ group QQ群: 309957875<br />
 # Change log
 2014-12-30<br />
 modify uart.on api, when run_input set to 0, uart.on now can read raw data from uart.<br />
-serial input now accept non-ascii chars
+serial input now accept non-ascii chars.<br />
+fix dev-kit gpio map.<br />
+add setip, setmac, sleeptype api to wifi module. <br />
+add tmr.time() api to get rtc time and calibration.
 
 [more change log](https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_en#change_log)<br />
 [更多变更日志](https://github.com/nodemcu/nodemcu-firmware/wiki/nodemcu_api_cn#change_log)
diff --git a/app/modules/wifi.c b/app/modules/wifi.c
index f3b43912..30e266f7 100644
--- a/app/modules/wifi.c
+++ b/app/modules/wifi.c
@@ -194,7 +194,7 @@ static int ICACHE_FLASH_ATTR wifi_getip( lua_State* L, uint8_t mode )
 
 static uint32_t parse_key(lua_State* L, const char * key){
   lua_getfield(L, 1, key);
-  if( lua_isstring(L, -1) )   // deal with the ssid string
+  if( lua_isstring(L, -1) )   // deal with the ip/netmask/gw string
   {
     const char *ip = luaL_checkstring( L, -1 );
     return ipaddr_addr(ip);
diff --git a/pre_build/0.9.4/512k-flash/nodemcu_512k_latest.bin b/pre_build/0.9.4/512k-flash/nodemcu_512k_latest.bin
index 69f33a9c2ac67a900267ac6e4a77dd665dd199dd..c546e899bd59cd763ce22149abbc3e7f3e3c61b7 100644
GIT binary patch
delta 126
zcmZp8Am0E)EsQNpTbPxDBHV-+4(KQte)!M$`Tqe11`bBU_x}}`ChPKWGBUmciC73K
z7)`bm)a5aJ`JeF>NW?=?!D+Im;?Xm=b$M+WS@+zrWzywwz4eSo=!D~qKn_Epg9^MK
W+N*<@ftUq|S%H{sdvy?d>s$b5zAe=N

delta 126
zcmZp8Am0E)EsQNpTbPxDB8~|%9MDlP{P3Ug^Zx@33`~j)hVT9>FiqCw;bdfd2NJRn
zR4|%sDX7b1`0_vFOOS|%qAjC>(_~#<Pes=~cWjw-d0cNj;}JUHcq5R*Q0Sln?*|5k
W_Ua&JAZ7t#Rv>2EULC~VIu`&r#4JDn

diff --git a/pre_build/latest/nodemcu_512k_latest.bin b/pre_build/latest/nodemcu_512k_latest.bin
index 69f33a9c2ac67a900267ac6e4a77dd665dd199dd..c546e899bd59cd763ce22149abbc3e7f3e3c61b7 100644
GIT binary patch
delta 126
zcmZp8Am0E)EsQNpTbPxDBHV-+4(KQte)!M$`Tqe11`bBU_x}}`ChPKWGBUmciC73K
z7)`bm)a5aJ`JeF>NW?=?!D+Im;?Xm=b$M+WS@+zrWzywwz4eSo=!D~qKn_Epg9^MK
W+N*<@ftUq|S%H{sdvy?d>s$b5zAe=N

delta 126
zcmZp8Am0E)EsQNpTbPxDB8~|%9MDlP{P3Ug^Zx@33`~j)hVT9>FiqCw;bdfd2NJRn
zR4|%sDX7b1`0_vFOOS|%qAjC>(_~#<Pes=~cWjw-d0cNj;}JUHcq5R*Q0Sln?*|5k
W_Ua&JAZ7t#Rv>2EULC~VIu`&r#4JDn