Commit e9081a81 authored by dnc40085's avatar dnc40085
Browse files

Remove conflict

parent f3167104
...@@ -383,8 +383,8 @@ static int wifi_station_config( lua_State* L ) ...@@ -383,8 +383,8 @@ static int wifi_station_config( lua_State* L )
if (sl>32 || ssid == NULL) if (sl>32 || ssid == NULL)
return luaL_error( L, "ssid:<32" ); return luaL_error( L, "ssid:<32" );
const char *password = luaL_checklstring( L, 2, &pl ); const char *password = luaL_checklstring( L, 2, &pl );
if (pl<8 || pl>64 || password == NULL) if (pl>64 || password == NULL)
return luaL_error( L, "pwd:8~64" ); return luaL_error( L, "pwd:<64" );
c_memset(sta_conf.ssid, 0, 32); c_memset(sta_conf.ssid, 0, 32);
c_memset(sta_conf.password, 0, 64); c_memset(sta_conf.password, 0, 64);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment