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

Fix for inability to use standard formatted MAC address with 

wifi.setmac() also changed wifi.getmac() to use macro
This commit is contained in:
dnc40085 2015-05-09 04:29:18 -07:00
parent 608d5f6be0
commit 7533a6afba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/wifi.c
View File

@ -219,7 +219,7 @@ static int wifi_getmac( lua_State* L, uint8_t mode )
char temp[64]; char temp[64];
uint8_t mac[6]; uint8_t mac[6];
wifi_get_macaddr(mode, mac); wifi_get_macaddr(mode, mac);
c_sprintf(temp, "%02X-%02X-%02X-%02X-%02X-%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] ); c_sprintf(temp, MACSTR, MAC2STR(mac));
lua_pushstring( L, temp ); lua_pushstring( L, temp );
return 1; return 1;
} }
@ -227,11 +227,13 @@ static int wifi_getmac( lua_State* L, uint8_t mode )
// Lua: mac = wifi.xx.setmac() // Lua: mac = wifi.xx.setmac()
static int wifi_setmac( lua_State* L, uint8_t mode ) static int wifi_setmac( lua_State* L, uint8_t mode )
{ {
uint8_t mac[6];
unsigned len = 0; unsigned len = 0;
const char *mac = luaL_checklstring( L, 1, &len ); const char *macaddr = luaL_checklstring( L, 1, &len );
if(len!=6) if(len!=17)
return luaL_error( L, "wrong arg type" ); return luaL_error( L, "wrong arg type" );
os_str2macaddr(mac, macaddr);
lua_pushboolean(L,wifi_set_macaddr(mode, (uint8 *)mac)); lua_pushboolean(L,wifi_set_macaddr(mode, (uint8 *)mac));
return 1; return 1;
} }