Unverified Commit 1990f957 authored by Terry Ellison's avatar Terry Ellison Committed by GitHub
Browse files

Updated ROTables 1st tranch (#2742)

Updated ROTables
parent e0f3dbed
......@@ -1864,114 +1864,114 @@ static int wifi_ap_dhcp_stop( lua_State* L )
// Module function map
static const LUA_REG_TYPE wifi_station_map[] = {
{ LSTRKEY( "autoconnect" ), LFUNCVAL( wifi_station_setauto ) },
{ LSTRKEY( "changeap" ), LFUNCVAL( wifi_station_change_ap ) },
{ LSTRKEY( "clearconfig"), LFUNCVAL( wifi_station_clear_config ) },
{ LSTRKEY( "config" ), LFUNCVAL( wifi_station_config ) },
{ LSTRKEY( "connect" ), LFUNCVAL( wifi_station_connect4lua ) },
{ LSTRKEY( "disconnect" ), LFUNCVAL( wifi_station_disconnect4lua ) },
{ LSTRKEY( "getap" ), LFUNCVAL( wifi_station_listap ) },
{ LSTRKEY( "getapindex" ), LFUNCVAL( wifi_station_get_ap_index ) },
{ LSTRKEY( "getapinfo" ), LFUNCVAL( wifi_station_get_ap_info4lua ) },
{ LSTRKEY( "getbroadcast" ), LFUNCVAL( wifi_station_getbroadcast) },
{ LSTRKEY( "getconfig" ), LFUNCVAL( wifi_station_getconfig_current ) },
{ LSTRKEY( "getdefaultconfig" ), LFUNCVAL( wifi_station_getconfig_default ) },
{ LSTRKEY( "gethostname" ), LFUNCVAL( wifi_sta_gethostname ) },
{ LSTRKEY( "getip" ), LFUNCVAL( wifi_station_getip ) },
{ LSTRKEY( "getmac" ), LFUNCVAL( wifi_station_getmac ) },
{ LSTRKEY( "getrssi" ), LFUNCVAL( wifi_station_getrssi ) },
{ LSTRKEY( "setaplimit" ), LFUNCVAL( wifi_station_ap_number_set4lua ) },
{ LSTRKEY( "sethostname" ), LFUNCVAL( wifi_sta_sethostname_lua ) },
{ LSTRKEY( "setip" ), LFUNCVAL( wifi_station_setip ) },
{ LSTRKEY( "setmac" ), LFUNCVAL( wifi_station_setmac ) },
{ LSTRKEY( "sleeptype" ), LFUNCVAL( wifi_station_sleeptype ) },
{ LSTRKEY( "status" ), LFUNCVAL( wifi_station_status ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE wifi_ap_dhcp_map[] = {
{ LSTRKEY( "config" ), LFUNCVAL( wifi_ap_dhcp_config ) },
{ LSTRKEY( "start" ), LFUNCVAL( wifi_ap_dhcp_start ) },
{ LSTRKEY( "stop" ), LFUNCVAL( wifi_ap_dhcp_stop ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE wifi_ap_map[] = {
{ LSTRKEY( "config" ), LFUNCVAL( wifi_ap_config ) },
{ LSTRKEY( "deauth" ), LFUNCVAL( wifi_ap_deauth ) },
{ LSTRKEY( "getip" ), LFUNCVAL( wifi_ap_getip ) },
{ LSTRKEY( "setip" ), LFUNCVAL( wifi_ap_setip ) },
{ LSTRKEY( "getbroadcast" ), LFUNCVAL( wifi_ap_getbroadcast) },
{ LSTRKEY( "getmac" ), LFUNCVAL( wifi_ap_getmac ) },
{ LSTRKEY( "setmac" ), LFUNCVAL( wifi_ap_setmac ) },
{ LSTRKEY( "getclient" ), LFUNCVAL( wifi_ap_listclient ) },
{ LSTRKEY( "getconfig" ), LFUNCVAL( wifi_ap_getconfig_current ) },
{ LSTRKEY( "getdefaultconfig" ), LFUNCVAL( wifi_ap_getconfig_default ) },
{ LSTRKEY( "dhcp" ), LROVAL( wifi_ap_dhcp_map ) },
//{ LSTRKEY( "__metatable" ), LROVAL( wifi_ap_map ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE wifi_map[] = {
{ LSTRKEY( "setmode" ), LFUNCVAL( wifi_setmode ) },
{ LSTRKEY( "getmode" ), LFUNCVAL( wifi_getmode ) },
{ LSTRKEY( "getdefaultmode" ), LFUNCVAL( wifi_getdefaultmode ) },
{ LSTRKEY( "getchannel" ), LFUNCVAL( wifi_getchannel ) },
{ LSTRKEY( "getcountry" ), LFUNCVAL( wifi_getcountry ) },
{ LSTRKEY( "setcountry" ), LFUNCVAL( wifi_setcountry ) },
{ LSTRKEY( "setphymode" ), LFUNCVAL( wifi_setphymode ) },
{ LSTRKEY( "getphymode" ), LFUNCVAL( wifi_getphymode ) },
{ LSTRKEY( "setmaxtxpower" ), LFUNCVAL( wifi_setmaxtxpower ) },
{ LSTRKEY( "suspend" ), LFUNCVAL( wifi_suspend ) },
{ LSTRKEY( "resume" ), LFUNCVAL( wifi_resume ) },
{ LSTRKEY( "nullmodesleep" ), LFUNCVAL( wifi_null_mode_auto_sleep ) },
LROT_BEGIN(wifi_station)
LROT_FUNCENTRY( autoconnect, wifi_station_setauto )
LROT_FUNCENTRY( changeap, wifi_station_change_ap )
LROT_FUNCENTRY( clearconfig, wifi_station_clear_config )
LROT_FUNCENTRY( config, wifi_station_config )
LROT_FUNCENTRY( connect, wifi_station_connect4lua )
LROT_FUNCENTRY( disconnect, wifi_station_disconnect4lua )
LROT_FUNCENTRY( getap, wifi_station_listap )
LROT_FUNCENTRY( getapindex, wifi_station_get_ap_index )
LROT_FUNCENTRY( getapinfo, wifi_station_get_ap_info4lua )
LROT_FUNCENTRY( getbroadcast, wifi_station_getbroadcast )
LROT_FUNCENTRY( getconfig, wifi_station_getconfig_current )
LROT_FUNCENTRY( getdefaultconfig, wifi_station_getconfig_default )
LROT_FUNCENTRY( gethostname, wifi_sta_gethostname )
LROT_FUNCENTRY( getip, wifi_station_getip )
LROT_FUNCENTRY( getmac, wifi_station_getmac )
LROT_FUNCENTRY( getrssi, wifi_station_getrssi )
LROT_FUNCENTRY( setaplimit, wifi_station_ap_number_set4lua )
LROT_FUNCENTRY( sethostname, wifi_sta_sethostname_lua )
LROT_FUNCENTRY( setip, wifi_station_setip )
LROT_FUNCENTRY( setmac, wifi_station_setmac )
LROT_FUNCENTRY( sleeptype, wifi_station_sleeptype )
LROT_FUNCENTRY( status, wifi_station_status )
LROT_END( wifi_station, wifi_station, 0 )
LROT_BEGIN(wifi_ap_dhcp)
LROT_FUNCENTRY( config, wifi_ap_dhcp_config )
LROT_FUNCENTRY( start, wifi_ap_dhcp_start )
LROT_FUNCENTRY( stop, wifi_ap_dhcp_stop )
LROT_END( wifi_ap_dhcp, wifi_ap_dhcp, 0 )
LROT_BEGIN(wifi_ap)
LROT_FUNCENTRY( config, wifi_ap_config )
LROT_FUNCENTRY( deauth, wifi_ap_deauth )
LROT_FUNCENTRY( getip, wifi_ap_getip )
LROT_FUNCENTRY( setip, wifi_ap_setip )
LROT_FUNCENTRY( getbroadcast, wifi_ap_getbroadcast )
LROT_FUNCENTRY( getmac, wifi_ap_getmac )
LROT_FUNCENTRY( setmac, wifi_ap_setmac )
LROT_FUNCENTRY( getclient, wifi_ap_listclient )
LROT_FUNCENTRY( getconfig, wifi_ap_getconfig_current )
LROT_FUNCENTRY( getdefaultconfig, wifi_ap_getconfig_default )
LROT_TABENTRY( dhcp, wifi_ap_dhcp )
// LROT_TABENTRY( __metatable, wifi_ap )
LROT_END( wifi_ap, wifi_ap, 0 )
LROT_BEGIN(wifi)
LROT_FUNCENTRY( setmode, wifi_setmode )
LROT_FUNCENTRY( getmode, wifi_getmode )
LROT_FUNCENTRY( getdefaultmode, wifi_getdefaultmode )
LROT_FUNCENTRY( getchannel, wifi_getchannel )
LROT_FUNCENTRY( getcountry, wifi_getcountry )
LROT_FUNCENTRY( setcountry, wifi_setcountry )
LROT_FUNCENTRY( setphymode, wifi_setphymode )
LROT_FUNCENTRY( getphymode, wifi_getphymode )
LROT_FUNCENTRY( setmaxtxpower, wifi_setmaxtxpower )
LROT_FUNCENTRY( suspend, wifi_suspend )
LROT_FUNCENTRY( resume, wifi_resume )
LROT_FUNCENTRY( nullmodesleep, wifi_null_mode_auto_sleep )
#ifdef WIFI_SMART_ENABLE
{ LSTRKEY( "startsmart" ), LFUNCVAL( wifi_start_smart ) },
{ LSTRKEY( "stopsmart" ), LFUNCVAL( wifi_exit_smart ) },
LROT_FUNCENTRY( startsmart, wifi_start_smart )
LROT_FUNCENTRY( stopsmart, wifi_exit_smart )
#endif
{ LSTRKEY( "sleeptype" ), LFUNCVAL( wifi_station_sleeptype ) },
LROT_FUNCENTRY( sleeptype, wifi_station_sleeptype )
{ LSTRKEY( "sta" ), LROVAL( wifi_station_map ) },
{ LSTRKEY( "ap" ), LROVAL( wifi_ap_map ) },
LROT_TABENTRY( sta, wifi_station )
LROT_TABENTRY( ap, wifi_ap )
#if defined(WIFI_SDK_EVENT_MONITOR_ENABLE)
{ LSTRKEY( "eventmon" ), LROVAL( wifi_event_monitor_map ) }, //declared in wifi_eventmon.c
LROT_TABENTRY( eventmon, wifi_event_monitor )
#endif
#if defined(LUA_USE_MODULES_WIFI_MONITOR)
{ LSTRKEY( "monitor" ), LROVAL( wifi_monitor_map ) }, //declared in wifi_monitor.c
LROT_TABENTRY( monitor, wifi_monitor )
#endif
{ LSTRKEY( "NULLMODE" ), LNUMVAL( NULL_MODE ) },
{ LSTRKEY( "STATION" ), LNUMVAL( STATION_MODE ) },
{ LSTRKEY( "SOFTAP" ), LNUMVAL( SOFTAP_MODE ) },
{ LSTRKEY( "STATIONAP" ), LNUMVAL( STATIONAP_MODE ) },
{ LSTRKEY( "PHYMODE_B" ), LNUMVAL( PHY_MODE_11B ) },
{ LSTRKEY( "PHYMODE_G" ), LNUMVAL( PHY_MODE_11G ) },
{ LSTRKEY( "PHYMODE_N" ), LNUMVAL( PHY_MODE_11N ) },
{ LSTRKEY( "NONE_SLEEP" ), LNUMVAL( NONE_SLEEP_T ) },
{ LSTRKEY( "LIGHT_SLEEP" ), LNUMVAL( LIGHT_SLEEP_T ) },
{ LSTRKEY( "MODEM_SLEEP" ), LNUMVAL( MODEM_SLEEP_T ) },
{ LSTRKEY( "OPEN" ), LNUMVAL( AUTH_OPEN ) },
//{ LSTRKEY( "WEP" ), LNUMVAL( AUTH_WEP ) },
{ LSTRKEY( "WPA_PSK" ), LNUMVAL( AUTH_WPA_PSK ) },
{ LSTRKEY( "WPA2_PSK" ), LNUMVAL( AUTH_WPA2_PSK ) },
{ LSTRKEY( "WPA_WPA2_PSK" ), LNUMVAL( AUTH_WPA_WPA2_PSK ) },
{ LSTRKEY( "STA_IDLE" ), LNUMVAL( STATION_IDLE ) },
{ LSTRKEY( "STA_CONNECTING" ), LNUMVAL( STATION_CONNECTING ) },
{ LSTRKEY( "STA_WRONGPWD" ), LNUMVAL( STATION_WRONG_PASSWORD ) },
{ LSTRKEY( "STA_APNOTFOUND" ), LNUMVAL( STATION_NO_AP_FOUND ) },
{ LSTRKEY( "STA_FAIL" ), LNUMVAL( STATION_CONNECT_FAIL ) },
{ LSTRKEY( "STA_GOTIP" ), LNUMVAL( STATION_GOT_IP ) },
{ LSTRKEY( "COUNTRY_AUTO" ), LNUMVAL( WIFI_COUNTRY_POLICY_AUTO ) },
{ LSTRKEY( "COUNTRY_MANUAL" ), LNUMVAL( WIFI_COUNTRY_POLICY_MANUAL ) },
{ LSTRKEY( "__metatable" ), LROVAL( wifi_map ) },
{ LNILKEY, LNILVAL }
};
LROT_NUMENTRY( NULLMODE, NULL_MODE )
LROT_NUMENTRY( STATION, STATION_MODE )
LROT_NUMENTRY( SOFTAP, SOFTAP_MODE )
LROT_NUMENTRY( STATIONAP, STATIONAP_MODE )
LROT_NUMENTRY( PHYMODE_B, PHY_MODE_11B )
LROT_NUMENTRY( PHYMODE_G, PHY_MODE_11G )
LROT_NUMENTRY( PHYMODE_N, PHY_MODE_11N )
LROT_NUMENTRY( NONE_SLEEP, NONE_SLEEP_T )
LROT_NUMENTRY( LIGHT_SLEEP, LIGHT_SLEEP_T )
LROT_NUMENTRY( MODEM_SLEEP, MODEM_SLEEP_T )
LROT_NUMENTRY( OPEN, AUTH_OPEN )
// LROT_NUMENTRY( WEP, AUTH_WEP )
LROT_NUMENTRY( WPA_PSK, AUTH_WPA_PSK )
LROT_NUMENTRY( WPA2_PSK, AUTH_WPA2_PSK )
LROT_NUMENTRY( WPA_WPA2_PSK, AUTH_WPA_WPA2_PSK )
LROT_NUMENTRY( STA_IDLE, STATION_IDLE )
LROT_NUMENTRY( STA_CONNECTING, STATION_CONNECTING )
LROT_NUMENTRY( STA_WRONGPWD, STATION_WRONG_PASSWORD )
LROT_NUMENTRY( STA_APNOTFOUND, STATION_NO_AP_FOUND )
LROT_NUMENTRY( STA_FAIL, STATION_CONNECT_FAIL )
LROT_NUMENTRY( STA_GOTIP, STATION_GOT_IP )
LROT_NUMENTRY( COUNTRY_AUTO, WIFI_COUNTRY_POLICY_AUTO )
LROT_NUMENTRY( COUNTRY_MANUAL, WIFI_COUNTRY_POLICY_MANUAL )
LROT_TABENTRY( __metatable, wifi )
LROT_END( wifi, wifi, 0 )
// Used by user_rf_pre_init(user_main.c)
void wifi_change_default_host_name(void)
......@@ -2024,4 +2024,4 @@ int luaopen_wifi( lua_State *L )
return 0;
}
NODEMCU_MODULE(WIFI, "wifi", wifi_map, luaopen_wifi);
NODEMCU_MODULE(WIFI, "wifi", wifi, luaopen_wifi);
......@@ -58,13 +58,13 @@ enum wifi_suspension_state{
#ifdef WIFI_SDK_EVENT_MONITOR_ENABLE
extern const LUA_REG_TYPE wifi_event_monitor_map[];
LROT_EXTERN(wifi_event_monitor);
void wifi_eventmon_init();
int wifi_event_monitor_register(lua_State* L);
#endif
#ifdef LUA_USE_MODULES_WIFI_MONITOR
extern const LUA_REG_TYPE wifi_monitor_map[];
LROT_EXTERN(wifi_monitor);
int wifi_monitor_init(lua_State *L);
#endif
......
......@@ -247,59 +247,57 @@ static void wifi_event_monitor_process_event_queue(task_param_t param, uint8 pri
}
#ifdef WIFI_EVENT_MONITOR_DISCONNECT_REASON_LIST_ENABLE
static const LUA_REG_TYPE wifi_event_monitor_reason_map[] =
{
{ LSTRKEY( "UNSPECIFIED" ), LNUMVAL( REASON_UNSPECIFIED ) },
{ LSTRKEY( "AUTH_EXPIRE" ), LNUMVAL( REASON_AUTH_EXPIRE ) },
{ LSTRKEY( "AUTH_LEAVE" ), LNUMVAL( REASON_AUTH_LEAVE ) },
{ LSTRKEY( "ASSOC_EXPIRE" ), LNUMVAL( REASON_ASSOC_EXPIRE ) },
{ LSTRKEY( "ASSOC_TOOMANY" ), LNUMVAL( REASON_ASSOC_TOOMANY ) },
{ LSTRKEY( "NOT_AUTHED" ), LNUMVAL( REASON_NOT_AUTHED ) },
{ LSTRKEY( "NOT_ASSOCED" ), LNUMVAL( REASON_NOT_ASSOCED ) },
{ LSTRKEY( "ASSOC_LEAVE" ), LNUMVAL( REASON_ASSOC_LEAVE ) },
{ LSTRKEY( "ASSOC_NOT_AUTHED" ), LNUMVAL( REASON_ASSOC_NOT_AUTHED ) },
{ LSTRKEY( "DISASSOC_PWRCAP_BAD" ), LNUMVAL( REASON_DISASSOC_PWRCAP_BAD ) },
{ LSTRKEY( "DISASSOC_SUPCHAN_BAD" ), LNUMVAL( REASON_DISASSOC_SUPCHAN_BAD ) },
{ LSTRKEY( "IE_INVALID" ), LNUMVAL( REASON_IE_INVALID ) },
{ LSTRKEY( "MIC_FAILURE" ), LNUMVAL( REASON_MIC_FAILURE ) },
{ LSTRKEY( "4WAY_HANDSHAKE_TIMEOUT" ), LNUMVAL( REASON_4WAY_HANDSHAKE_TIMEOUT ) },
{ LSTRKEY( "GROUP_KEY_UPDATE_TIMEOUT" ), LNUMVAL( REASON_GROUP_KEY_UPDATE_TIMEOUT ) },
{ LSTRKEY( "IE_IN_4WAY_DIFFERS" ), LNUMVAL( REASON_IE_IN_4WAY_DIFFERS ) },
{ LSTRKEY( "GROUP_CIPHER_INVALID" ), LNUMVAL( REASON_GROUP_CIPHER_INVALID ) },
{ LSTRKEY( "PAIRWISE_CIPHER_INVALID" ), LNUMVAL( REASON_PAIRWISE_CIPHER_INVALID ) },
{ LSTRKEY( "AKMP_INVALID" ), LNUMVAL( REASON_AKMP_INVALID ) },
{ LSTRKEY( "UNSUPP_RSN_IE_VERSION" ), LNUMVAL( REASON_UNSUPP_RSN_IE_VERSION ) },
{ LSTRKEY( "INVALID_RSN_IE_CAP" ), LNUMVAL( REASON_INVALID_RSN_IE_CAP ) },
{ LSTRKEY( "802_1X_AUTH_FAILED" ), LNUMVAL( REASON_802_1X_AUTH_FAILED ) },
{ LSTRKEY( "CIPHER_SUITE_REJECTED" ), LNUMVAL( REASON_CIPHER_SUITE_REJECTED ) },
{ LSTRKEY( "BEACON_TIMEOUT" ), LNUMVAL( REASON_BEACON_TIMEOUT ) },
{ LSTRKEY( "NO_AP_FOUND" ), LNUMVAL( REASON_NO_AP_FOUND ) },
{ LSTRKEY( "AUTH_FAIL" ), LNUMVAL( REASON_AUTH_FAIL ) },
{ LSTRKEY( "ASSOC_FAIL" ), LNUMVAL( REASON_ASSOC_FAIL ) },
{ LSTRKEY( "HANDSHAKE_TIMEOUT" ), LNUMVAL( REASON_HANDSHAKE_TIMEOUT ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(wifi_event_monitor_reason)
LROT_NUMENTRY( UNSPECIFIED, REASON_UNSPECIFIED )
LROT_NUMENTRY( AUTH_EXPIRE, REASON_AUTH_EXPIRE )
LROT_NUMENTRY( AUTH_LEAVE, REASON_AUTH_LEAVE )
LROT_NUMENTRY( ASSOC_EXPIRE, REASON_ASSOC_EXPIRE )
LROT_NUMENTRY( ASSOC_TOOMANY, REASON_ASSOC_TOOMANY )
LROT_NUMENTRY( NOT_AUTHED, REASON_NOT_AUTHED )
LROT_NUMENTRY( NOT_ASSOCED, REASON_NOT_ASSOCED )
LROT_NUMENTRY( ASSOC_LEAVE, REASON_ASSOC_LEAVE )
LROT_NUMENTRY( ASSOC_NOT_AUTHED, REASON_ASSOC_NOT_AUTHED )
LROT_NUMENTRY( DISASSOC_PWRCAP_BAD, REASON_DISASSOC_PWRCAP_BAD )
LROT_NUMENTRY( DISASSOC_SUPCHAN_BAD, REASON_DISASSOC_SUPCHAN_BAD )
LROT_NUMENTRY( IE_INVALID, REASON_IE_INVALID )
LROT_NUMENTRY( MIC_FAILURE, REASON_MIC_FAILURE )
LROT_NUMENTRY( 4WAY_HANDSHAKE_TIMEOUT, REASON_4WAY_HANDSHAKE_TIMEOUT )
LROT_NUMENTRY( GROUP_KEY_UPDATE_TIMEOUT, REASON_GROUP_KEY_UPDATE_TIMEOUT )
LROT_NUMENTRY( IE_IN_4WAY_DIFFERS, REASON_IE_IN_4WAY_DIFFERS )
LROT_NUMENTRY( GROUP_CIPHER_INVALID, REASON_GROUP_CIPHER_INVALID )
LROT_NUMENTRY( PAIRWISE_CIPHER_INVALID, REASON_PAIRWISE_CIPHER_INVALID )
LROT_NUMENTRY( AKMP_INVALID, REASON_AKMP_INVALID )
LROT_NUMENTRY( UNSUPP_RSN_IE_VERSION, REASON_UNSUPP_RSN_IE_VERSION )
LROT_NUMENTRY( INVALID_RSN_IE_CAP, REASON_INVALID_RSN_IE_CAP )
LROT_NUMENTRY( 802_1X_AUTH_FAILED, REASON_802_1X_AUTH_FAILED )
LROT_NUMENTRY( CIPHER_SUITE_REJECTED, REASON_CIPHER_SUITE_REJECTED )
LROT_NUMENTRY( BEACON_TIMEOUT, REASON_BEACON_TIMEOUT )
LROT_NUMENTRY( NO_AP_FOUND, REASON_NO_AP_FOUND )
LROT_NUMENTRY( AUTH_FAIL, REASON_AUTH_FAIL )
LROT_NUMENTRY( ASSOC_FAIL, REASON_ASSOC_FAIL )
LROT_NUMENTRY( HANDSHAKE_TIMEOUT, REASON_HANDSHAKE_TIMEOUT )
LROT_END( wifi_event_monitor_reason, NULL, 0 )
#endif
const LUA_REG_TYPE wifi_event_monitor_map[] =
{
{ LSTRKEY( "register" ), LFUNCVAL( wifi_event_monitor_register ) },
{ LSTRKEY( "unregister" ), LFUNCVAL( wifi_event_monitor_register ) },
{ LSTRKEY( "STA_CONNECTED" ), LNUMVAL( EVENT_STAMODE_CONNECTED ) },
{ LSTRKEY( "STA_DISCONNECTED" ), LNUMVAL( EVENT_STAMODE_DISCONNECTED ) },
{ LSTRKEY( "STA_AUTHMODE_CHANGE" ), LNUMVAL( EVENT_STAMODE_AUTHMODE_CHANGE ) },
{ LSTRKEY( "STA_GOT_IP" ), LNUMVAL( EVENT_STAMODE_GOT_IP ) },
{ LSTRKEY( "STA_DHCP_TIMEOUT" ), LNUMVAL( EVENT_STAMODE_DHCP_TIMEOUT ) },
{ LSTRKEY( "AP_STACONNECTED" ), LNUMVAL( EVENT_SOFTAPMODE_STACONNECTED ) },
{ LSTRKEY( "AP_STADISCONNECTED" ), LNUMVAL( EVENT_SOFTAPMODE_STADISCONNECTED ) },
{ LSTRKEY( "AP_PROBEREQRECVED" ), LNUMVAL( EVENT_SOFTAPMODE_PROBEREQRECVED ) },
{ LSTRKEY( "WIFI_MODE_CHANGED" ), LNUMVAL( EVENT_OPMODE_CHANGED ) },
{ LSTRKEY( "EVENT_MAX" ), LNUMVAL( EVENT_MAX ) },
LROT_PUBLIC_BEGIN(wifi_event_monitor)
LROT_FUNCENTRY( register, wifi_event_monitor_register )
LROT_FUNCENTRY( unregister, wifi_event_monitor_register )
LROT_NUMENTRY( STA_CONNECTED, EVENT_STAMODE_CONNECTED )
LROT_NUMENTRY( STA_DISCONNECTED, EVENT_STAMODE_DISCONNECTED )
LROT_NUMENTRY( STA_AUTHMODE_CHANGE, EVENT_STAMODE_AUTHMODE_CHANGE )
LROT_NUMENTRY( STA_GOT_IP, EVENT_STAMODE_GOT_IP )
LROT_NUMENTRY( STA_DHCP_TIMEOUT, EVENT_STAMODE_DHCP_TIMEOUT )
LROT_NUMENTRY( AP_STACONNECTED, EVENT_SOFTAPMODE_STACONNECTED )
LROT_NUMENTRY( AP_STADISCONNECTED, EVENT_SOFTAPMODE_STADISCONNECTED )
LROT_NUMENTRY( AP_PROBEREQRECVED, EVENT_SOFTAPMODE_PROBEREQRECVED )
LROT_NUMENTRY( WIFI_MODE_CHANGED, EVENT_OPMODE_CHANGED )
LROT_NUMENTRY( EVENT_MAX, EVENT_MAX )
#ifdef WIFI_EVENT_MONITOR_DISCONNECT_REASON_LIST_ENABLE
{ LSTRKEY( "reason" ), LROVAL( wifi_event_monitor_reason_map ) },
LROT_TABENTRY( reason, wifi_event_monitor_reason )
#endif
{ LNILKEY, LNILVAL }
};
LROT_END( wifi_event_monitor, NULL, 0 )
void wifi_eventmon_init()
{
......
......@@ -276,7 +276,7 @@ typedef struct {
uint8 buf[];
} packet_t;
static const LUA_REG_TYPE packet_function_map[];
LROT_TABLE(packet_function)
static void wifi_rx_cb(uint8 *buf, uint16 len) {
if (len != sizeof(struct sniffer_buf2)) {
......@@ -570,7 +570,7 @@ static int packet_map_lookup(lua_State *L) {
}
// Now search the packet function map
lua_pushrotable(L, (void *)packet_function_map);
lua_pushrotable(L, LROT_TABLEREF(packet_function));
lua_getfield(L, -1, field);
if (!lua_isnil(L, -1)) {
return 1;
......@@ -757,32 +757,32 @@ static int wifi_monitor_stop(lua_State *L) {
return 0;
}
static const LUA_REG_TYPE packet_function_map[] = {
{ LSTRKEY( "radio_byte" ), LFUNCVAL( packet_radio_byte ) },
{ LSTRKEY( "frame_byte" ), LFUNCVAL( packet_frame_byte ) },
{ LSTRKEY( "radio_sub" ), LFUNCVAL( packet_radio_sub ) },
{ LSTRKEY( "frame_sub" ), LFUNCVAL( packet_frame_sub ) },
{ LSTRKEY( "radio_subhex" ), LFUNCVAL( packet_radio_subhex ) },
{ LSTRKEY( "frame_subhex" ), LFUNCVAL( packet_frame_subhex ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(packet_function)
LROT_FUNCENTRY( radio_byte, packet_radio_byte )
LROT_FUNCENTRY( frame_byte, packet_frame_byte )
LROT_FUNCENTRY( radio_sub, packet_radio_sub )
LROT_FUNCENTRY( frame_sub, packet_frame_sub )
LROT_FUNCENTRY( radio_subhex, packet_radio_subhex )
LROT_FUNCENTRY( frame_subhex, packet_frame_subhex )
LROT_END( packet_function, packet_function, LROT_MASK_INDEX )
LROT_BEGIN(packet)
LROT_FUNCENTRY( __index, packet_map_lookup )
LROT_END( packet, packet, LROT_MASK_INDEX )
static const LUA_REG_TYPE packet_map[] = {
{ LSTRKEY( "__index" ), LFUNCVAL( packet_map_lookup ) },
{ LNILKEY, LNILVAL }
};
// Module function map
const LUA_REG_TYPE wifi_monitor_map[] = {
{ LSTRKEY( "start" ), LFUNCVAL( wifi_monitor_start ) },
{ LSTRKEY( "stop" ), LFUNCVAL( wifi_monitor_stop ) },
{ LSTRKEY( "channel" ), LFUNCVAL( wifi_monitor_channel ) },
{ LNILKEY, LNILVAL }
};
LROT_PUBLIC_BEGIN(wifi_monitor)
LROT_FUNCENTRY( start, wifi_monitor_start )
LROT_FUNCENTRY( stop, wifi_monitor_stop )
LROT_FUNCENTRY( channel, wifi_monitor_channel )
LROT_END( wifi_monitor, NULL, 0 )
int wifi_monitor_init(lua_State *L)
{
luaL_rometatable(L, "wifi.packet", (void *)packet_map);
luaL_rometatable(L, "wifi.packet", LROT_TABLEREF(packet));
tasknumber = task_get_id(monitor_task);
eventmon_setup();
......
......@@ -52,22 +52,22 @@ static int ICACHE_FLASH_ATTR wps_start(lua_State* L)
}
// Module function map
const LUA_REG_TYPE wps_map[] = {
{ LSTRKEY( "disable" ), LFUNCVAL( wps_disable ) },
{ LSTRKEY( "enable" ), LFUNCVAL( wps_enable ) },
{ LSTRKEY( "start" ), LFUNCVAL( wps_start ) },
{ LSTRKEY( "SUCCESS" ), LNUMVAL( WPS_CB_ST_SUCCESS ) },
{ LSTRKEY( "FAILED" ), LNUMVAL( WPS_CB_ST_FAILED ) },
{ LSTRKEY( "TIMEOUT" ), LNUMVAL( WPS_CB_ST_TIMEOUT ) },
{ LSTRKEY( "WEP" ), LNUMVAL( WPS_CB_ST_WEP ) },
{ LSTRKEY( "SCAN_ERR" ), LNUMVAL( 4 ) }, // WPS_CB_ST_SCAN_ERR
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(wps)
LROT_FUNCENTRY( disable, wps_disable )
LROT_FUNCENTRY( enable, wps_enable )
LROT_FUNCENTRY( start, wps_start )
LROT_NUMENTRY( SUCCESS, WPS_CB_ST_SUCCESS )
LROT_NUMENTRY( FAILED, WPS_CB_ST_FAILED )
LROT_NUMENTRY( TIMEOUT, WPS_CB_ST_TIMEOUT )
LROT_NUMENTRY( WEP, WPS_CB_ST_WEP )
LROT_NUMENTRY( SCAN_ERR, 4 )
LROT_END( wps, NULL, 0 )
int luaopen_wps( lua_State *L )
{
return 0;
}
NODEMCU_MODULE(WPS, "wps", wps_map, luaopen_wps);
NODEMCU_MODULE(WPS, "wps", wps, luaopen_wps);
......@@ -122,11 +122,10 @@ static int ICACHE_FLASH_ATTR ws2801_writergb(lua_State* L) {
return 0;
}
static const LUA_REG_TYPE ws2801_map[] =
{
{ LSTRKEY( "write" ), LFUNCVAL( ws2801_writergb )},
{ LSTRKEY( "init" ), LFUNCVAL( ws2801_init_lua )},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(WS2801, "ws2801", ws2801_map, NULL);
LROT_BEGIN(ws2801)
LROT_FUNCENTRY( write, ws2801_writergb )
LROT_FUNCENTRY( init, ws2801_init_lua )
LROT_END( ws2801, NULL, 0 )
NODEMCU_MODULE(WS2801, "ws2801", ws2801, NULL);
......@@ -591,44 +591,42 @@ static int ws2812_buffer_tostring(lua_State* L) {
}
static const LUA_REG_TYPE ws2812_buffer_map[] =
{
{ LSTRKEY( "dump" ), LFUNCVAL( ws2812_buffer_dump )},
{ LSTRKEY( "fade" ), LFUNCVAL( ws2812_buffer_fade )},
{ LSTRKEY( "fill" ), LFUNCVAL( ws2812_buffer_fill_lua )},
{ LSTRKEY( "get" ), LFUNCVAL( ws2812_buffer_get )},
{ LSTRKEY( "replace" ), LFUNCVAL( ws2812_buffer_replace )},
{ LSTRKEY( "mix" ), LFUNCVAL( ws2812_buffer_mix )},
{ LSTRKEY( "power" ), LFUNCVAL( ws2812_buffer_power )},
{ LSTRKEY( "set" ), LFUNCVAL( ws2812_buffer_set )},
{ LSTRKEY( "shift" ), LFUNCVAL( ws2812_buffer_shift_lua )},
{ LSTRKEY( "size" ), LFUNCVAL( ws2812_buffer_size )},
{ LSTRKEY( "sub" ), LFUNCVAL( ws2812_buffer_sub )},
{ LSTRKEY( "__concat" ),LFUNCVAL( ws2812_buffer_concat )},
{ LSTRKEY( "__index" ), LROVAL( ws2812_buffer_map )},
{ LSTRKEY( "__tostring" ), LFUNCVAL( ws2812_buffer_tostring )},
{ LNILKEY, LNILVAL}
};
static const LUA_REG_TYPE ws2812_map[] =
{
{ LSTRKEY( "init" ), LFUNCVAL( ws2812_init )},
{ LSTRKEY( "newBuffer" ), LFUNCVAL( ws2812_new_buffer )},
{ LSTRKEY( "write" ), LFUNCVAL( ws2812_write )},
{ LSTRKEY( "FADE_IN" ), LNUMVAL( FADE_IN ) },
{ LSTRKEY( "FADE_OUT" ), LNUMVAL( FADE_OUT ) },
{ LSTRKEY( "MODE_SINGLE" ), LNUMVAL( MODE_SINGLE ) },
{ LSTRKEY( "MODE_DUAL" ), LNUMVAL( MODE_DUAL ) },
{ LSTRKEY( "SHIFT_LOGICAL" ), LNUMVAL( SHIFT_LOGICAL ) },
{ LSTRKEY( "SHIFT_CIRCULAR" ), LNUMVAL( SHIFT_CIRCULAR ) },
{ LNILKEY, LNILVAL}
};
LROT_BEGIN(ws2812_buffer)
LROT_FUNCENTRY( dump, ws2812_buffer_dump )
LROT_FUNCENTRY( fade, ws2812_buffer_fade )
LROT_FUNCENTRY( fill, ws2812_buffer_fill_lua )
LROT_FUNCENTRY( get, ws2812_buffer_get )
LROT_FUNCENTRY( replace, ws2812_buffer_replace )
LROT_FUNCENTRY( mix, ws2812_buffer_mix )
LROT_FUNCENTRY( power, ws2812_buffer_power )
LROT_FUNCENTRY( set, ws2812_buffer_set )
LROT_FUNCENTRY( shift, ws2812_buffer_shift_lua )
LROT_FUNCENTRY( size, ws2812_buffer_size )
LROT_FUNCENTRY( sub, ws2812_buffer_sub )
LROT_FUNCENTRY( __concat, ws2812_buffer_concat )
LROT_TABENTRY( __index, ws2812_buffer )
LROT_FUNCENTRY( __tostring, ws2812_buffer_tostring )
LROT_END( ws2812_buffer, ws2812_buffer, LROT_MASK_INDEX )
LROT_BEGIN(ws2812)
LROT_FUNCENTRY( init, ws2812_init )
LROT_FUNCENTRY( newBuffer, ws2812_new_buffer )
LROT_FUNCENTRY( write, ws2812_write )
LROT_NUMENTRY( FADE_IN, FADE_IN )
LROT_NUMENTRY( FADE_OUT, FADE_OUT )
LROT_NUMENTRY( MODE_SINGLE, MODE_SINGLE )
LROT_NUMENTRY( MODE_DUAL, MODE_DUAL )
LROT_NUMENTRY( SHIFT_LOGICAL, SHIFT_LOGICAL )
LROT_NUMENTRY( SHIFT_CIRCULAR, SHIFT_CIRCULAR )
LROT_END( ws2812, NULL, 0 )
int luaopen_ws2812(lua_State *L) {
// TODO: Make sure that the GPIO system is initialized
luaL_rometatable(L, "ws2812.buffer", (void *)ws2812_buffer_map); // create metatable for ws2812.buffer
luaL_rometatable(L, "ws2812.buffer", LROT_TABLEREF(ws2812_buffer));
return 0;
}
NODEMCU_MODULE(WS2812, "ws2812", ws2812_map, luaopen_ws2812);
NODEMCU_MODULE(WS2812, "ws2812", ws2812, luaopen_ws2812);
......@@ -1038,23 +1038,22 @@ static int ws2812_effects_tostring(lua_State* L) {
return 1;
}
static const LUA_REG_TYPE ws2812_effects_map[] =
{
{ LSTRKEY( "init" ), LFUNCVAL( ws2812_effects_init )},
{ LSTRKEY( "set_brightness" ), LFUNCVAL( ws2812_effects_set_brightness )},
{ LSTRKEY( "set_color" ), LFUNCVAL( ws2812_effects_set_color )},
{ LSTRKEY( "set_speed" ), LFUNCVAL( ws2812_effects_set_speed )},
{ LSTRKEY( "set_delay" ), LFUNCVAL( ws2812_effects_set_delay )},
{ LSTRKEY( "set_mode" ), LFUNCVAL( ws2812_effects_set_mode )},
{ LSTRKEY( "start" ), LFUNCVAL( ws2812_effects_start )},
{ LSTRKEY( "stop" ), LFUNCVAL( ws2812_effects_stop )},
{ LSTRKEY( "get_delay" ), LFUNCVAL( ws2812_effects_get_delay )},
{ LSTRKEY( "get_speed" ), LFUNCVAL( ws2812_effects_get_speed )},
{ LSTRKEY( "__index" ), LROVAL( ws2812_effects_map )},
{ LSTRKEY( "__tostring" ), LFUNCVAL( ws2812_effects_tostring )},
{ LNILKEY, LNILVAL}
};
LROT_BEGIN(ws2812_effects)
LROT_FUNCENTRY( init, ws2812_effects_init )
LROT_FUNCENTRY( set_brightness, ws2812_effects_set_brightness )
LROT_FUNCENTRY( set_color, ws2812_effects_set_color )
LROT_FUNCENTRY( set_speed, ws2812_effects_set_speed )
LROT_FUNCENTRY( set_delay, ws2812_effects_set_delay )
LROT_FUNCENTRY( set_mode, ws2812_effects_set_mode )
LROT_FUNCENTRY( start, ws2812_effects_start )
LROT_FUNCENTRY( stop, ws2812_effects_stop )
LROT_FUNCENTRY( get_delay, ws2812_effects_get_delay )
LROT_FUNCENTRY( get_speed, ws2812_effects_get_speed )
LROT_TABENTRY( __index, ws2812_effects )
LROT_FUNCENTRY( __tostring, ws2812_effects_tostring )
LROT_END( ws2812_effects, ws2812_effects, LROT_MASK_INDEX )
NODEMCU_MODULE(WS2812_EFFECTS, "ws2812_effects", ws2812_effects_map, NULL);
NODEMCU_MODULE(WS2812_EFFECTS, "ws2812_effects", ws2812_effects, NULL);
......@@ -203,15 +203,15 @@ static int xpt2046_getPositionAvg( lua_State* L ) {
}
// Module function map
static const LUA_REG_TYPE xpt2046_map[] = {
{ LSTRKEY( "isTouched"), LFUNCVAL(xpt2046_isTouched) },
{ LSTRKEY( "getRaw" ), LFUNCVAL(xpt2046_getRaw) },
{ LSTRKEY( "getPosition"), LFUNCVAL(xpt2046_getPosition)},
{ LSTRKEY( "getPositionAvg"), LFUNCVAL(xpt2046_getPositionAvg)},
{ LSTRKEY( "setCalibration"), LFUNCVAL(xpt2046_setCalibration)},
{ LSTRKEY( "init" ), LFUNCVAL(xpt2046_init) },
{ LNILKEY, LNILVAL }
};
NODEMCU_MODULE(XPT2046, "xpt2046", xpt2046_map, NULL);
LROT_BEGIN(xpt2046)
LROT_FUNCENTRY( isTouched, xpt2046_isTouched )
LROT_FUNCENTRY( getRaw, xpt2046_getRaw )
LROT_FUNCENTRY( getPosition, xpt2046_getPosition )
LROT_FUNCENTRY( getPositionAvg, xpt2046_getPositionAvg )
LROT_FUNCENTRY( setCalibration, xpt2046_setCalibration )
LROT_FUNCENTRY( init, xpt2046_init )
LROT_END( xpt2046, NULL, 0 )
NODEMCU_MODULE(XPT2046, "xpt2046", xpt2046, NULL);
......@@ -530,15 +530,15 @@ int resume_timers_lua(lua_State* L){
return 0;
}
static const LUA_REG_TYPE test_swtimer_debug_map[] = {
{ LSTRKEY( "timer_list" ), LFUNCVAL( print_timer_list ) },
{ LSTRKEY( "susp_timer_list" ), LFUNCVAL( print_susp_timer_list ) },
{ LSTRKEY( "suspend" ), LFUNCVAL( suspend_timers_lua ) },
{ LSTRKEY( "resume" ), LFUNCVAL( resume_timers_lua ) },
{ LNILKEY, LNILVAL }
};
NODEMCU_MODULE(SWTMR_DBG, "SWTMR_DBG", test_swtimer_debug_map, NULL);
LROT_BEGIN(test_swtimer_debug)
LROT_FUNCENTRY( timer_list, print_timer_list )
LROT_FUNCENTRY( susp_timer_list, print_susp_timer_list )
LROT_FUNCENTRY( suspend, suspend_timers_lua )
LROT_FUNCENTRY( resume, resume_timers_lua )
LROT_END( test_swtimer_debug, NULL, 0 )
NODEMCU_MODULE(SWTMR_DBG, "SWTMR_DBG", test_swtimer_debug, NULL);
#endif
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