Unverified Commit eaac369d authored by Johny Mattsson's avatar Johny Mattsson Committed by GitHub
Browse files

LFS support for ESP32 NodeMCU (#2801)

* Port LFS from ESP8266 to ESP32
parent 7cb61a27
...@@ -536,46 +536,38 @@ static int lbthci_rawhci (lua_State *L) ...@@ -536,46 +536,38 @@ static int lbthci_rawhci (lua_State *L)
} }
static const LUA_REG_TYPE bthci_adv_map[] = LROT_BEGIN(bthci_adv)
{ LROT_FUNCENTRY( enable, lbthci_adv_enable )
{ LSTRKEY( "enable" ), LFUNCVAL( lbthci_adv_enable ) }, LROT_FUNCENTRY( setdata, lbthci_adv_setdata )
{ LSTRKEY( "setdata" ), LFUNCVAL( lbthci_adv_setdata ) }, LROT_FUNCENTRY( setparams, lbthci_adv_setparams )
{ LSTRKEY( "setparams" ), LFUNCVAL( lbthci_adv_setparams ) },
// Advertising types // Advertising types
{ LSTRKEY( "CONN_UNDIR"), LNUMVAL( ADV_IND ) }, LROT_NUMENTRY ( CONN_UNDIR, ADV_IND )
{ LSTRKEY( "CONN_DIR_HI"), LNUMVAL( ADV_DIRECT_IND_HI_DUTY ) }, LROT_NUMENTRY ( CONN_DIR_HI, ADV_DIRECT_IND_HI_DUTY )
{ LSTRKEY( "SCAN_UNDIR"), LNUMVAL( ADV_SCAN_IND ) }, LROT_NUMENTRY ( SCAN_UNDIR, ADV_SCAN_IND )
{ LSTRKEY( "NONCONN_UNDIR"), LNUMVAL( ADV_NONCONN_IND ) }, LROT_NUMENTRY ( NONCONN_UNDIR, ADV_NONCONN_IND )
{ LSTRKEY( "CONN_DIR_LO"), LNUMVAL( ADV_DIRECT_IND_LO_DUTY ) }, LROT_NUMENTRY ( CONN_DIR_LO, ADV_DIRECT_IND_LO_DUTY )
{ LSTRKEY( "CHAN_37" ), LNUMVAL( ADV_CHAN_37 ) }, LROT_NUMENTRY ( CHAN_37, ADV_CHAN_37 )
{ LSTRKEY( "CHAN_38" ), LNUMVAL( ADV_CHAN_38 ) }, LROT_NUMENTRY ( CHAN_38, ADV_CHAN_38 )
{ LSTRKEY( "CHAN_39" ), LNUMVAL( ADV_CHAN_39 ) }, LROT_NUMENTRY ( CHAN_39, ADV_CHAN_39 )
{ LSTRKEY( "CHAN_ALL" ), LNUMVAL( ADV_CHAN_ALL ) }, LROT_NUMENTRY ( CHAN_ALL, ADV_CHAN_ALL )
LROT_END(bthci_adv, NULL, 0)
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(bthci_scan)
LROT_FUNCENTRY( enable, lbthci_scan )
static const LUA_REG_TYPE bthci_scan_map[] = LROT_FUNCENTRY( setparams, lbthci_scan_setparams )
{ LROT_FUNCENTRY( on, lbthci_scan_on )
{ LSTRKEY( "enable" ), LFUNCVAL( lbthci_scan ) }, LROT_END(bthci_scan, NULL, 0)
{ LSTRKEY( "setparams" ), LFUNCVAL( lbthci_scan_setparams ) },
{ LSTRKEY( "on" ), LFUNCVAL( lbthci_scan_on ) },
{ LNILKEY, LNILVAL } LROT_BEGIN(bthci)
}; LROT_FUNCENTRY( rawhci, lbthci_rawhci )
LROT_FUNCENTRY( reset, lbthci_reset )
LROT_TABENTRY ( adv, bthci_adv )
static const LUA_REG_TYPE bthci_map[] = LROT_TABENTRY ( scan, bthci_scan )
{ LROT_END(bthci, NULL, 0)
{ LSTRKEY( "rawhci" ), LFUNCVAL( lbthci_rawhci ) },
{ LSTRKEY( "reset" ), LFUNCVAL( lbthci_reset ) }, NODEMCU_MODULE(BTHCI, "bthci", bthci, lbthci_init);
{ LSTRKEY( "adv" ), LROVAL( bthci_adv_map ) },
{ LSTRKEY( "scan" ), LROVAL( bthci_scan_map ) },
{ LNILKEY, LNILVAL }
};
NODEMCU_MODULE(BTHCI, "bthci", bthci_map, lbthci_init);
#endif #endif
...@@ -148,16 +148,14 @@ static int can_send( lua_State *L ) ...@@ -148,16 +148,14 @@ static int can_send( lua_State *L )
} }
// Module function map // Module function map
static const LUA_REG_TYPE can_map[] = LROT_BEGIN(can)
{ LROT_FUNCENTRY( setup, can_setup )
{ LSTRKEY( "setup" ), LFUNCVAL( can_setup ) }, LROT_FUNCENTRY( start, can_start )
{ LSTRKEY( "start" ), LFUNCVAL( can_start ) }, LROT_FUNCENTRY( stop, can_stop )
{ LSTRKEY( "stop" ), LFUNCVAL( can_stop ) }, LROT_FUNCENTRY( send, can_send )
{ LSTRKEY( "send" ), LFUNCVAL( can_send ) }, LROT_NUMENTRY ( STANDARD_FRAME, 0 )
{ LSTRKEY( "STANDARD_FRAME" ), LNUMVAL( 0 ) }, LROT_NUMENTRY ( EXTENDED_FRAME, 1 )
{ LSTRKEY( "EXTENDED_FRAME" ), LNUMVAL( 1 ) }, LROT_END(can, NULL, 0)
{ LNILKEY, LNILVAL }
};
int luaopen_can( lua_State *L ) { int luaopen_can( lua_State *L ) {
can_data_task_id = task_get_id( can_data_task ); // reset CAN after sw reset can_data_task_id = task_get_id( can_data_task ); // reset CAN after sw reset
...@@ -165,4 +163,4 @@ int luaopen_can( lua_State *L ) { ...@@ -165,4 +163,4 @@ int luaopen_can( lua_State *L ) {
return 0; return 0;
} }
NODEMCU_MODULE(CAN, "can", can_map, luaopen_can); NODEMCU_MODULE(CAN, "can", can, luaopen_can);
...@@ -153,18 +153,18 @@ static int crypto_hash_gc(lua_State* L) { ...@@ -153,18 +153,18 @@ static int crypto_hash_gc(lua_State* L) {
} }
// The following table defines methods of the hasher object // The following table defines methods of the hasher object
static const LUA_REG_TYPE crypto_hasher_map[] = { LROT_BEGIN(crypto_hasher)
{LSTRKEY("update"), LFUNCVAL(crypto_hash_update)}, LROT_FUNCENTRY(update, crypto_hash_update)
{LSTRKEY("finalize"), LFUNCVAL(crypto_hash_finalize)}, LROT_FUNCENTRY(finalize, crypto_hash_finalize)
{LSTRKEY("__gc"), LFUNCVAL(crypto_hash_gc)}, LROT_FUNCENTRY(__gc, crypto_hash_gc)
{LSTRKEY("__index"), LROVAL(crypto_hasher_map)}, LROT_TABENTRY(__index, crypto_hasher)
{LNILKEY, LNILVAL}}; LROT_END(crypto_hasher, NULL, 0)
// This table defines the functions of the crypto module: // This table defines the functions of the crypto module:
static const LUA_REG_TYPE crypto_map[] = { LROT_BEGIN(crypto)
{LSTRKEY("new_hash"), LFUNCVAL(crypto_new_hash)}, LROT_FUNCENTRY(new_hash, crypto_new_hash)
{LSTRKEY("new_hmac"), LFUNCVAL(crypto_new_hmac)}, LROT_FUNCENTRY(new_hmac, crypto_new_hmac)
{LNILKEY, LNILVAL}}; LROT_END(crypto, NULL, 0)
// luaopen_crypto is the crypto module initialization function // luaopen_crypto is the crypto module initialization function
int luaopen_crypto(lua_State* L) { int luaopen_crypto(lua_State* L) {
...@@ -174,4 +174,4 @@ int luaopen_crypto(lua_State* L) { ...@@ -174,4 +174,4 @@ int luaopen_crypto(lua_State* L) {
} }
// define the crypto NodeMCU module // define the crypto NodeMCU module
NODEMCU_MODULE(CRYPTO, "crypto", crypto_map, luaopen_crypto); NODEMCU_MODULE(CRYPTO, "crypto", crypto, luaopen_crypto);
...@@ -52,16 +52,12 @@ static int ldac_write( lua_State *L ) ...@@ -52,16 +52,12 @@ static int ldac_write( lua_State *L )
// Module function map // Module function map
static const LUA_REG_TYPE dac_map[] = LROT_BEGIN(dac)
{ LROT_FUNCENTRY( enable, ldac_enable )
{ LSTRKEY( "enable" ), LFUNCVAL( ldac_enable ) }, LROT_FUNCENTRY( disable, ldac_disable )
{ LSTRKEY( "disable" ), LFUNCVAL( ldac_disable ) }, LROT_FUNCENTRY( write, ldac_write )
{ LSTRKEY( "write" ), LFUNCVAL( ldac_write ) }, LROT_NUMENTRY ( CHANNEL_1, DAC_CHANNEL_1 )
LROT_NUMENTRY ( CHANNEL_2, DAC_CHANNEL_2 )
{ LSTRKEY( "CHANNEL_1" ), LNUMVAL( DAC_CHANNEL_1 ) }, LROT_END(dac, NULL, 0)
{ LSTRKEY( "CHANNEL_2" ), LNUMVAL( DAC_CHANNEL_2 ) },
NODEMCU_MODULE(DAC, "dac", dac, NULL);
{ LNILKEY, LNILVAL }
};
NODEMCU_MODULE(DAC, "dac", dac_map, NULL);
...@@ -91,13 +91,12 @@ static int ldht_read2x( lua_State *L ) ...@@ -91,13 +91,12 @@ static int ldht_read2x( lua_State *L )
} }
static const LUA_REG_TYPE dht_map[] = { LROT_BEGIN(dht)
{ LSTRKEY( "read11" ), LFUNCVAL( ldht_read11 ) }, LROT_FUNCENTRY( read11, ldht_read11 )
{ LSTRKEY( "read2x" ), LFUNCVAL( ldht_read2x ) }, LROT_FUNCENTRY( read2x, ldht_read2x )
{ LSTRKEY( "OK" ), LNUMVAL( LDHT_OK ) }, LROT_NUMENTRY ( OK, LDHT_OK )
{ LSTRKEY( "ERROR_CHECKSUM" ), LNUMVAL( LDHT_ERROR_CHECKSUM ) }, LROT_NUMENTRY ( ERROR_CHECKSUM, LDHT_ERROR_CHECKSUM )
{ LSTRKEY( "ERROR_TIMEOUT" ), LNUMVAL( LDHT_ERROR_TIMEOUT ) }, LROT_NUMENTRY ( ERROR_TIMEOUT, LDHT_ERROR_TIMEOUT )
{ LNILKEY, LNILVAL } LROT_END(dht, NULL, 0)
};
NODEMCU_MODULE(DHT, "dht", dht, NULL);
NODEMCU_MODULE(DHT, "dht", dht_map, NULL);
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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