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

Split wifi.on() into wifi.sta.on()/wifi.ap.on() 

As discussed in #1615.
This commit is contained in:
Johny Mattsson 2016-12-10 15:25:57 +11:00
parent b29d436400
commit 334ba08131
5 changed files with 301 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
components/modules/wifi.c
View File

@ -33,66 +33,7 @@
#include "module.h"
#include "lauxlib.h"
#include "lextra.h"
#include "esp_wifi.h"
#include "wifi_common.h"
#include "ip_fmt.h"
#include "nodemcu_esp_event.h"
#include <string.h>
typedef void (*fill_cb_arg_fn) (lua_State *L, const system_event_t *evt);
typedef struct
{
const char *name;
system_event_id_t event_id;
fill_cb_arg_fn fill_cb_arg;
} event_desc_t;
// Forward declarations
static void on_event (const system_event_t *evt);
static void sta_conn (lua_State *L, const system_event_t *evt);
static void sta_disconn (lua_State *L, const system_event_t *evt);
static void sta_authmode (lua_State *L, const system_event_t *evt);
static void sta_got_ip (lua_State *L, const system_event_t *evt);
static void ap_staconn (lua_State *L, const system_event_t *evt);
static void ap_stadisconn (lua_State *L, const system_event_t *evt);
static void ap_probe_req (lua_State *L, const system_event_t *evt);
static void empty_arg (lua_State *L, const system_event_t *evt) {}
static const event_desc_t events[] =
{
{ "sta_start", SYSTEM_EVENT_STA_START, empty_arg },
{ "sta_stop", SYSTEM_EVENT_STA_STOP, empty_arg },
{ "sta_connected", SYSTEM_EVENT_STA_CONNECTED, sta_conn },
{ "sta_disconnected", SYSTEM_EVENT_STA_DISCONNECTED, sta_disconn },
{ "sta_authmode_changed", SYSTEM_EVENT_STA_AUTHMODE_CHANGE, sta_authmode },
{ "sta_got_ip", SYSTEM_EVENT_STA_GOT_IP, sta_got_ip },
{ "ap_start", SYSTEM_EVENT_AP_START, empty_arg },
{ "ap_stop", SYSTEM_EVENT_AP_STOP, empty_arg },
{ "ap_sta_connected", SYSTEM_EVENT_AP_STACONNECTED, ap_staconn },
{ "ap_sta_disconnected", SYSTEM_EVENT_AP_STADISCONNECTED, ap_stadisconn },
{ "ap_probe_req", SYSTEM_EVENT_AP_PROBEREQRECVED, ap_probe_req }
};
#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
static int event_cb[ARRAY_LEN(events)];
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_START, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_STOP, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_CONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_DISCONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_AUTHMODE_CHANGE, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_GOT_IP, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_START, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STOP, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STACONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STADISCONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_PROBEREQRECVED, on_event);
static int wifi_getmode (lua_State *L)
{
@ -105,150 +46,6 @@ static int wifi_getmode (lua_State *L)
}
static int event_idx_by_name (const char *name)
{
for (unsigned i = 0; i < ARRAY_LEN(events); ++i)
if (strcmp (events[i].name, name) == 0)
return i;
return -1;
}
static int event_idx_by_id (system_event_id_t id)
{
for (unsigned i = 0; i < ARRAY_LEN(events); ++i)
if (events[i].event_id == id)
return i;
return -1;
}
static void sta_conn (lua_State *L, const system_event_t *evt)
{
lua_pushlstring (L,
(const char *)evt->event_info.connected.ssid,
evt->event_info.connected.ssid_len);
lua_setfield (L, -2, "ssid");
char bssid_str[MAC_STR_SZ];
macstr (bssid_str, evt->event_info.connected.bssid);
lua_pushstring (L, bssid_str);
lua_setfield (L, -2, "bssid");
lua_pushinteger (L, evt->event_info.connected.channel);
lua_setfield (L, -2, "channel");
lua_pushinteger (L, evt->event_info.connected.authmode);
lua_setfield (L, -2, "auth");
}
static void sta_disconn (lua_State *L, const system_event_t *evt)
{
lua_pushlstring (L,
(const char *)evt->event_info.disconnected.ssid,
evt->event_info.disconnected.ssid_len);
lua_setfield (L, -2, "ssid");
char bssid_str[MAC_STR_SZ];
macstr (bssid_str, evt->event_info.disconnected.bssid);
lua_pushstring (L, bssid_str);
lua_setfield (L, -2, "bssid");
lua_pushinteger (L, evt->event_info.disconnected.reason);
lua_setfield (L, -2, "reason");
}
static void sta_authmode (lua_State *L, const system_event_t *evt)
{
lua_pushinteger (L, evt->event_info.auth_change.old_mode);
lua_setfield (L, -2, "old_mode");
lua_pushinteger (L, evt->event_info.auth_change.new_mode);
lua_setfield (L, -2, "new_mode");
}
static void sta_got_ip (lua_State *L, const system_event_t *evt)
{
char ipstr[IP_STR_SZ] = { 0 };
ip4str (ipstr, &evt->event_info.got_ip.ip_info.ip);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "ip");
ip4str (ipstr, &evt->event_info.got_ip.ip_info.netmask);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "netmask");
ip4str (ipstr, &evt->event_info.got_ip.ip_info.gw);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "gw");
}
static void ap_staconn (lua_State *L, const system_event_t *evt)
{
char mac[MAC_STR_SZ];
macstr (mac, evt->event_info.sta_connected.mac);
lua_pushstring (L, mac);
lua_setfield (L, -2, "mac");
lua_pushinteger (L, evt->event_info.sta_connected.aid);
lua_setfield (L, -2, "id");
}
static void ap_stadisconn (lua_State *L, const system_event_t *evt)
{
char mac[MAC_STR_SZ];
macstr (mac, evt->event_info.sta_disconnected.mac);
lua_pushstring (L, mac);
lua_setfield (L, -2, "mac");
lua_pushinteger (L, evt->event_info.sta_disconnected.aid);
lua_setfield (L, -2, "id");
}
static void ap_probe_req (lua_State *L, const system_event_t *evt)
{
char str[MAC_STR_SZ];
macstr (str, evt->event_info.ap_probereqrecved.mac);
lua_pushstring (L, str);
lua_setfield (L, -2, "from");
lua_pushinteger (L, evt->event_info.ap_probereqrecved.rssi);
lua_setfield (L, -2, "rssi");
}
static void on_event (const system_event_t *evt)
{
int idx = event_idx_by_id (evt->event_id);
if (idx < 0 || event_cb[idx] == LUA_NOREF)
return;
lua_State *L = lua_getstate ();
lua_rawgeti (L, LUA_REGISTRYINDEX, event_cb[idx]);
lua_pushstring (L, events[idx].name);
lua_createtable (L, 0, 5);
events[idx].fill_cb_arg (L, evt);
lua_call (L, 2, 0);
}
static int wifi_eventmon (lua_State *L)
{
const char *event_name = luaL_checkstring (L, 1);
if (!lua_isnoneornil (L, 2))
luaL_checkanyfunction (L, 2);
lua_settop (L, 2);
int idx = event_idx_by_name (event_name);
if (idx < 0)
return luaL_error (L, "unknown event: %s", event_name);
luaL_unref (L, LUA_REGISTRYINDEX, event_cb[idx]);
event_cb[idx] = lua_isnoneornil (L, 2) ?
LUA_NOREF : luaL_ref (L, LUA_REGISTRYINDEX);
return 0;
}
static int wifi_mode (lua_State *L)
{
int mode = luaL_checkinteger (L, 1);
@ -285,10 +82,13 @@ static int wifi_stop (lua_State *L)
}
extern void wifi_ap_init (void);
extern void wifi_sta_init (void);
static int wifi_init (lua_State *L)
{
for (unsigned i = 0; i < ARRAY_LEN(event_cb); ++i)
event_cb[i] = LUA_NOREF;
wifi_ap_init ();
wifi_sta_init ();
wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
esp_err_t err = esp_wifi_init (&cfg);
@ -303,7 +103,6 @@ extern const LUA_REG_TYPE wifi_ap_map[];
static const LUA_REG_TYPE wifi_map[] =
{
{ LSTRKEY( "getmode" ), LFUNCVAL( wifi_getmode ) },
{ LSTRKEY( "on" ), LFUNCVAL( wifi_eventmon ) },
{ LSTRKEY( "mode" ), LFUNCVAL( wifi_mode ) },
{ LSTRKEY( "start" ), LFUNCVAL( wifi_start ) },
{ LSTRKEY( "stop" ), LFUNCVAL( wifi_stop ) },

88
components/modules/wifi_ap.c
View File

@ -34,7 +34,8 @@
#include "lauxlib.h"
#include "lextra.h"
#include "wifi_common.h"
#include "esp_wifi.h"
#include "ip_fmt.h"
#include "nodemcu_esp_event.h"
#include <string.h>
@ -42,6 +43,84 @@
#define DEFAULT_AP_MAXCONNS 4
#define DEFAULT_AP_BEACON 100
// --- Event handling ----------------------------------------------------
static void ap_staconn (lua_State *L, const system_event_t *evt);
static void ap_stadisconn (lua_State *L, const system_event_t *evt);
static void ap_probe_req (lua_State *L, const system_event_t *evt);
static void empty_arg (lua_State *L, const system_event_t *evt) {}
static const event_desc_t events[] =
{
{ "start", SYSTEM_EVENT_AP_START, empty_arg },
{ "stop", SYSTEM_EVENT_AP_STOP, empty_arg },
{ "sta_connected", SYSTEM_EVENT_AP_STACONNECTED, ap_staconn },
{ "sta_disconnected", SYSTEM_EVENT_AP_STADISCONNECTED, ap_stadisconn },
{ "probe_req", SYSTEM_EVENT_AP_PROBEREQRECVED, ap_probe_req }
};
static int event_cb[ARRAY_LEN(events)];
static void ap_staconn (lua_State *L, const system_event_t *evt)
{
char mac[MAC_STR_SZ];
macstr (mac, evt->event_info.sta_connected.mac);
lua_pushstring (L, mac);
lua_setfield (L, -2, "mac");
lua_pushinteger (L, evt->event_info.sta_connected.aid);
lua_setfield (L, -2, "id");
}
static void ap_stadisconn (lua_State *L, const system_event_t *evt)
{
char mac[MAC_STR_SZ];
macstr (mac, evt->event_info.sta_disconnected.mac);
lua_pushstring (L, mac);
lua_setfield (L, -2, "mac");
lua_pushinteger (L, evt->event_info.sta_disconnected.aid);
lua_setfield (L, -2, "id");
}
static void ap_probe_req (lua_State *L, const system_event_t *evt)
{
char str[MAC_STR_SZ];
macstr (str, evt->event_info.ap_probereqrecved.mac);
lua_pushstring (L, str);
lua_setfield (L, -2, "from");
lua_pushinteger (L, evt->event_info.ap_probereqrecved.rssi);
lua_setfield (L, -2, "rssi");
}
static void on_event (const system_event_t *evt)
{
int idx = wifi_event_idx_by_id (events, ARRAY_LEN(events), evt->event_id);
if (idx < 0 || event_cb[idx] == LUA_NOREF)
return;
lua_State *L = lua_getstate ();
lua_rawgeti (L, LUA_REGISTRYINDEX, event_cb[idx]);
lua_pushstring (L, events[idx].name);
lua_createtable (L, 0, 5);
events[idx].fill_cb_arg (L, evt);
lua_call (L, 2, 0);
}
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_START, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STOP, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STACONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_STADISCONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_AP_PROBEREQRECVED, on_event);
void wifi_ap_init (void)
{
for (unsigned i = 0; i < ARRAY_LEN(event_cb); ++i)
event_cb[i] = LUA_NOREF;
}
// --- Lua API funcs -----------------------------------------------------
static int wifi_ap_config (lua_State *L)
{
luaL_checkanytable (L, 1);
@ -89,9 +168,16 @@ static int wifi_ap_config (lua_State *L)
}
static int wifi_ap_on (lua_State *L)
{
return wifi_on (L, events, ARRAY_LEN(events), event_cb);
}
const LUA_REG_TYPE wifi_ap_map[] =
{
{ LSTRKEY( "config" ), LFUNCVAL( wifi_ap_config ) },
{ LSTRKEY( "on" ), LFUNCVAL( wifi_ap_on ) },
{ LSTRKEY( "AUTH_OPEN" ), LNUMVAL( WIFI_AUTH_OPEN ) },
{ LSTRKEY( "AUTH_WEP" ), LNUMVAL( WIFI_AUTH_WEP ) },

71
components/modules/wifi_common.c Normal file
View File

@ -0,0 +1,71 @@
/*
* Copyright (c) 2016 Johny Mattsson
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the copyright holders nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "wifi_common.h"
#include "ip_fmt.h"
#include "lauxlib.h"
#include <string.h>
int wifi_event_idx_by_name (const event_desc_t *table, unsigned n, const char *name)
{
for (unsigned i = 0; i < n; ++i)
if (strcmp (table[i].name, name) == 0)
return i;
return -1;
}
int wifi_event_idx_by_id (const event_desc_t *table, unsigned n, system_event_id_t id)
{
for (unsigned i = 0; i < n; ++i)
if (table[i].event_id == id)
return i;
return -1;
}
int wifi_on (lua_State *L, const event_desc_t *table, unsigned n, int *event_cb)
{
const char *event_name = luaL_checkstring (L, 1);
if (!lua_isnoneornil (L, 2))
luaL_checkanyfunction (L, 2);
lua_settop (L, 2);
int idx = wifi_event_idx_by_name (table, n, event_name);
if (idx < 0)
return luaL_error (L, "unknown event: %s", event_name);
luaL_unref (L, LUA_REGISTRYINDEX, event_cb[idx]);
event_cb[idx] = lua_isnoneornil (L, 2) ?
LUA_NOREF : luaL_ref (L, LUA_REGISTRYINDEX);
return 0;
}

19
components/modules/wifi_common.h
View File

@ -34,6 +34,8 @@
#define _NODEMCU_WIFI_H_
#include <stdint.h>
#include "esp_wifi.h"
#include "lua.h"
// Shared sta/ap macros
@ -47,4 +49,21 @@
} while(0)
// Shared event handling support
typedef void (*fill_cb_arg_fn) (lua_State *L, const system_event_t *evt);
typedef struct
{
const char *name;
system_event_id_t event_id;
fill_cb_arg_fn fill_cb_arg;
} event_desc_t;
#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
int wifi_event_idx_by_name (const event_desc_t *table, unsigned n, const char *name);
int wifi_event_idx_by_id (const event_desc_t *table, unsigned n, system_event_id_t id);
int wifi_on (lua_State *L, const event_desc_t *table, unsigned n, int *event_cb);
#endif

120
components/modules/wifi_sta.c
View File

@ -37,11 +37,121 @@
#include "nodemcu_esp_event.h"
#include "wifi_common.h"
#include "ip_fmt.h"
#include "esp_wifi.h"
#include "nodemcu_esp_event.h"
#include <string.h>
static int scan_cb_ref = LUA_NOREF;
// --- Event handling -----------------------------------------------------
static void sta_conn (lua_State *L, const system_event_t *evt);
static void sta_disconn (lua_State *L, const system_event_t *evt);
static void sta_authmode (lua_State *L, const system_event_t *evt);
static void sta_got_ip (lua_State *L, const system_event_t *evt);
static void empty_arg (lua_State *L, const system_event_t *evt) {}
static const event_desc_t events[] =
{
{ "start", SYSTEM_EVENT_STA_START, empty_arg },
{ "stop", SYSTEM_EVENT_STA_STOP, empty_arg },
{ "connected", SYSTEM_EVENT_STA_CONNECTED, sta_conn },
{ "disconnected", SYSTEM_EVENT_STA_DISCONNECTED, sta_disconn },
{ "authmode_changed", SYSTEM_EVENT_STA_AUTHMODE_CHANGE, sta_authmode },
{ "got_ip", SYSTEM_EVENT_STA_GOT_IP, sta_got_ip },
};
#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
static int event_cb[ARRAY_LEN(events)];
static void sta_conn (lua_State *L, const system_event_t *evt)
{
lua_pushlstring (L,
(const char *)evt->event_info.connected.ssid,
evt->event_info.connected.ssid_len);
lua_setfield (L, -2, "ssid");
char bssid_str[MAC_STR_SZ];
macstr (bssid_str, evt->event_info.connected.bssid);
lua_pushstring (L, bssid_str);
lua_setfield (L, -2, "bssid");
lua_pushinteger (L, evt->event_info.connected.channel);
lua_setfield (L, -2, "channel");
lua_pushinteger (L, evt->event_info.connected.authmode);
lua_setfield (L, -2, "auth");
}
static void sta_disconn (lua_State *L, const system_event_t *evt)
{
lua_pushlstring (L,
(const char *)evt->event_info.disconnected.ssid,
evt->event_info.disconnected.ssid_len);
lua_setfield (L, -2, "ssid");
char bssid_str[MAC_STR_SZ];
macstr (bssid_str, evt->event_info.disconnected.bssid);
lua_pushstring (L, bssid_str);
lua_setfield (L, -2, "bssid");
lua_pushinteger (L, evt->event_info.disconnected.reason);
lua_setfield (L, -2, "reason");
}
static void sta_authmode (lua_State *L, const system_event_t *evt)
{
lua_pushinteger (L, evt->event_info.auth_change.old_mode);
lua_setfield (L, -2, "old_mode");
lua_pushinteger (L, evt->event_info.auth_change.new_mode);
lua_setfield (L, -2, "new_mode");
}
static void sta_got_ip (lua_State *L, const system_event_t *evt)
{
char ipstr[IP_STR_SZ] = { 0 };
ip4str (ipstr, &evt->event_info.got_ip.ip_info.ip);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "ip");
ip4str (ipstr, &evt->event_info.got_ip.ip_info.netmask);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "netmask");
ip4str (ipstr, &evt->event_info.got_ip.ip_info.gw);
lua_pushstring (L, ipstr);
lua_setfield (L, -2, "gw");
}
static void on_event (const system_event_t *evt)
{
int idx = wifi_event_idx_by_id (events, ARRAY_LEN(events), evt->event_id);
if (idx < 0 || event_cb[idx] == LUA_NOREF)
return;
lua_State *L = lua_getstate ();
lua_rawgeti (L, LUA_REGISTRYINDEX, event_cb[idx]);
lua_pushstring (L, events[idx].name);
lua_createtable (L, 0, 5);
events[idx].fill_cb_arg (L, evt);
lua_call (L, 2, 0);
}
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_START, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_STOP, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_CONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_DISCONNECTED, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_AUTHMODE_CHANGE, on_event);
NODEMCU_ESP_EVENT(SYSTEM_EVENT_STA_GOT_IP, on_event);
void wifi_sta_init (void)
{
for (unsigned i = 0; i < ARRAY_LEN(event_cb); ++i)
event_cb[i] = LUA_NOREF;
}
// --- Helper functions -----------------------------------------------------
static void do_connect (const system_event_t *evt)
{
@ -50,6 +160,8 @@ static void do_connect (const system_event_t *evt)
}
// --- Lua API functions ----------------------------------------------------
static int wifi_sta_config (lua_State *L)
{
luaL_checkanytable (L, 1);
@ -226,6 +338,11 @@ static void on_scan_done (const system_event_t *evt)
}
static int wifi_sta_on (lua_State *L)
{
return wifi_on (L, events, ARRAY_LEN(events), event_cb);
}
static int wifi_sta_scan (lua_State *L)
{
if (scan_cb_ref != LUA_NOREF)
@ -259,6 +376,7 @@ const LUA_REG_TYPE wifi_sta_map[] = {
{ LSTRKEY( "connect" ), LFUNCVAL( wifi_sta_connect ) },
{ LSTRKEY( "disconnect" ), LFUNCVAL( wifi_sta_disconnect ) },
{ LSTRKEY( "getconfig" ), LFUNCVAL( wifi_sta_getconfig ) },
{ LSTRKEY( "on" ), LFUNCVAL( wifi_sta_on ) },
{ LSTRKEY( "scan" ), LFUNCVAL( wifi_sta_scan ) },
{ LNILKEY, LNILVAL }