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
......@@ -61,13 +61,13 @@ static int adc_init107( lua_State *L )
}
// Module function map
static const LUA_REG_TYPE adc_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( adc_sample ) },
{ LSTRKEY( "readvdd33" ), LFUNCVAL( adc_readvdd33 ) },
{ LSTRKEY( "force_init_mode" ), LFUNCVAL( adc_init107 ) },
{ LSTRKEY( "INIT_ADC" ), LNUMVAL( 0x00 ) },
{ LSTRKEY( "INIT_VDD33" ),LNUMVAL( 0xff ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(adc)
LROT_FUNCENTRY( read, adc_sample )
LROT_FUNCENTRY( readvdd33, adc_readvdd33 )
LROT_FUNCENTRY( force_init_mode, adc_init107 )
LROT_NUMENTRY( INIT_ADC, 0x00 )
LROT_NUMENTRY( INIT_VDD33, 0xff )
LROT_END( adc, NULL, 0 )
NODEMCU_MODULE(ADC, "adc", adc_map, NULL);
NODEMCU_MODULE(ADC, "adc", adc, NULL);
......@@ -531,71 +531,68 @@ static int ads1115_lua_delete(lua_State *L) {
return 0;
}
static const LUA_REG_TYPE ads1115_map[] = {
{ LSTRKEY( "ads1115" ), LFUNCVAL(ads1115_lua_register_1115) },
{ LSTRKEY( "ads1015" ), LFUNCVAL(ads1115_lua_register_1015) },
{ LSTRKEY( "reset" ), LFUNCVAL(ads1115_lua_reset) },
{ LSTRKEY( "ADDR_GND" ), LNUMVAL(ADS1115_I2C_ADDR_GND) },
{ LSTRKEY( "ADDR_VDD" ), LNUMVAL(ADS1115_I2C_ADDR_VDD) },
{ LSTRKEY( "ADDR_SDA" ), LNUMVAL(ADS1115_I2C_ADDR_SDA) },
{ LSTRKEY( "ADDR_SCL" ), LNUMVAL(ADS1115_I2C_ADDR_SCL) },
{ LSTRKEY( "SINGLE_SHOT" ), LNUMVAL(ADS1115_MODE_SINGLE) },
{ LSTRKEY( "CONTINUOUS" ), LNUMVAL(ADS1115_MODE_CONTIN) },
{ LSTRKEY( "DIFF_0_1" ), LNUMVAL(ADS1115_MUX_DIFF_0_1) },
{ LSTRKEY( "DIFF_0_3" ), LNUMVAL(ADS1115_MUX_DIFF_0_3) },
{ LSTRKEY( "DIFF_1_3" ), LNUMVAL(ADS1115_MUX_DIFF_1_3) },
{ LSTRKEY( "DIFF_2_3" ), LNUMVAL(ADS1115_MUX_DIFF_2_3) },
{ LSTRKEY( "SINGLE_0" ), LNUMVAL(ADS1115_MUX_SINGLE_0) },
{ LSTRKEY( "SINGLE_1" ), LNUMVAL(ADS1115_MUX_SINGLE_1) },
{ LSTRKEY( "SINGLE_2" ), LNUMVAL(ADS1115_MUX_SINGLE_2) },
{ LSTRKEY( "SINGLE_3" ), LNUMVAL(ADS1115_MUX_SINGLE_3) },
{ LSTRKEY( "GAIN_6_144V" ), LNUMVAL(ADS1115_PGA_6_144V) },
{ LSTRKEY( "GAIN_4_096V" ), LNUMVAL(ADS1115_PGA_4_096V) },
{ LSTRKEY( "GAIN_2_048V" ), LNUMVAL(ADS1115_PGA_2_048V) },
{ LSTRKEY( "GAIN_1_024V" ), LNUMVAL(ADS1115_PGA_1_024V) },
{ LSTRKEY( "GAIN_0_512V" ), LNUMVAL(ADS1115_PGA_0_512V) },
{ LSTRKEY( "GAIN_0_256V" ), LNUMVAL(ADS1115_PGA_0_256V) },
{ LSTRKEY( "DR_8SPS" ), LNUMVAL(ADS1115_DR_8SPS) },
{ LSTRKEY( "DR_16SPS" ), LNUMVAL(ADS1115_DR_16SPS) },
{ LSTRKEY( "DR_32SPS" ), LNUMVAL(ADS1115_DR_32SPS) },
{ LSTRKEY( "DR_64SPS" ), LNUMVAL(ADS1115_DR_64SPS) },
{ LSTRKEY( "DR_128SPS" ), LNUMVAL(ADS1115_DR_128SPS) },
{ LSTRKEY( "DR_250SPS" ), LNUMVAL(ADS1115_DR_250SPS) },
{ LSTRKEY( "DR_475SPS" ), LNUMVAL(ADS1115_DR_475SPS) },
{ LSTRKEY( "DR_490SPS" ), LNUMVAL(ADS1115_DR_490SPS) },
{ LSTRKEY( "DR_860SPS" ), LNUMVAL(ADS1115_DR_860SPS) },
{ LSTRKEY( "DR_920SPS" ), LNUMVAL(ADS1115_DR_920SPS) },
{ LSTRKEY( "DR_1600SPS" ), LNUMVAL(ADS1115_DR_1600SPS) },
{ LSTRKEY( "DR_2400SPS" ), LNUMVAL(ADS1115_DR_2400SPS) },
{ LSTRKEY( "DR_3300SPS" ), LNUMVAL(ADS1115_DR_3300SPS) },
{ LSTRKEY( "CONV_RDY_1" ), LNUMVAL(ADS1115_CQUE_1CONV) },
{ LSTRKEY( "CONV_RDY_2" ), LNUMVAL(ADS1115_CQUE_2CONV) },
{ LSTRKEY( "CONV_RDY_4" ), LNUMVAL(ADS1115_CQUE_4CONV) },
{ LSTRKEY( "COMP_1CONV" ), LNUMVAL(ADS1115_CQUE_1CONV) },
{ LSTRKEY( "COMP_2CONV" ), LNUMVAL(ADS1115_CQUE_2CONV) },
{ LSTRKEY( "COMP_4CONV" ), LNUMVAL(ADS1115_CQUE_4CONV) },
{ LSTRKEY( "CMODE_TRAD"), LNUMVAL(ADS1115_CMODE_TRAD) },
{ LSTRKEY( "CMODE_WINDOW"), LNUMVAL(ADS1115_CMODE_WINDOW) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE ads1115_instance_map[] = {
{ LSTRKEY( "setting" ), LFUNCVAL(ads1115_lua_setting) },
{ LSTRKEY( "startread" ), LFUNCVAL(ads1115_lua_startread) },
{ LSTRKEY( "read" ), LFUNCVAL(ads1115_lua_read) },
LROT_BEGIN(ads1115)
LROT_FUNCENTRY( ads1115, ads1115_lua_register_1115 )
LROT_FUNCENTRY( ads1015, ads1115_lua_register_1015 )
LROT_FUNCENTRY( reset, ads1115_lua_reset )
LROT_NUMENTRY( ADDR_GND, ADS1115_I2C_ADDR_GND )
LROT_NUMENTRY( ADDR_VDD, ADS1115_I2C_ADDR_VDD )
LROT_NUMENTRY( ADDR_SDA, ADS1115_I2C_ADDR_SDA )
LROT_NUMENTRY( ADDR_SCL, ADS1115_I2C_ADDR_SCL )
LROT_NUMENTRY( SINGLE_SHOT, ADS1115_MODE_SINGLE )
LROT_NUMENTRY( CONTINUOUS, ADS1115_MODE_CONTIN )
LROT_NUMENTRY( DIFF_0_1, ADS1115_MUX_DIFF_0_1 )
LROT_NUMENTRY( DIFF_0_3, ADS1115_MUX_DIFF_0_3 )
LROT_NUMENTRY( DIFF_1_3, ADS1115_MUX_DIFF_1_3 )
LROT_NUMENTRY( DIFF_2_3, ADS1115_MUX_DIFF_2_3 )
LROT_NUMENTRY( SINGLE_0, ADS1115_MUX_SINGLE_0 )
LROT_NUMENTRY( SINGLE_1, ADS1115_MUX_SINGLE_1 )
LROT_NUMENTRY( SINGLE_2, ADS1115_MUX_SINGLE_2 )
LROT_NUMENTRY( SINGLE_3, ADS1115_MUX_SINGLE_3 )
LROT_NUMENTRY( GAIN_6_144V, ADS1115_PGA_6_144V )
LROT_NUMENTRY( GAIN_4_096V, ADS1115_PGA_4_096V )
LROT_NUMENTRY( GAIN_2_048V, ADS1115_PGA_2_048V )
LROT_NUMENTRY( GAIN_1_024V, ADS1115_PGA_1_024V )
LROT_NUMENTRY( GAIN_0_512V, ADS1115_PGA_0_512V )
LROT_NUMENTRY( GAIN_0_256V, ADS1115_PGA_0_256V )
LROT_NUMENTRY( DR_8SPS, ADS1115_DR_8SPS )
LROT_NUMENTRY( DR_16SPS, ADS1115_DR_16SPS )
LROT_NUMENTRY( DR_32SPS, ADS1115_DR_32SPS )
LROT_NUMENTRY( DR_64SPS, ADS1115_DR_64SPS )
LROT_NUMENTRY( DR_128SPS, ADS1115_DR_128SPS )
LROT_NUMENTRY( DR_250SPS, ADS1115_DR_250SPS )
LROT_NUMENTRY( DR_475SPS, ADS1115_DR_475SPS )
LROT_NUMENTRY( DR_490SPS, ADS1115_DR_490SPS )
LROT_NUMENTRY( DR_860SPS, ADS1115_DR_860SPS )
LROT_NUMENTRY( DR_920SPS, ADS1115_DR_920SPS )
LROT_NUMENTRY( DR_1600SPS, ADS1115_DR_1600SPS )
LROT_NUMENTRY( DR_2400SPS, ADS1115_DR_2400SPS )
LROT_NUMENTRY( DR_3300SPS, ADS1115_DR_3300SPS )
LROT_NUMENTRY( CONV_RDY_1, ADS1115_CQUE_1CONV )
LROT_NUMENTRY( CONV_RDY_2, ADS1115_CQUE_2CONV )
LROT_NUMENTRY( CONV_RDY_4, ADS1115_CQUE_4CONV )
LROT_NUMENTRY( COMP_1CONV, ADS1115_CQUE_1CONV )
LROT_NUMENTRY( COMP_2CONV, ADS1115_CQUE_2CONV )
LROT_NUMENTRY( COMP_4CONV, ADS1115_CQUE_4CONV )
LROT_NUMENTRY( CMODE_TRAD, ADS1115_CMODE_TRAD )
LROT_NUMENTRY( CMODE_WINDOW, ADS1115_CMODE_WINDOW )
LROT_END(ads1115, NULL, 0 )
LROT_BEGIN(ads1115_instance)
LROT_FUNCENTRY( setting, ads1115_lua_setting )
LROT_FUNCENTRY( startread, ads1115_lua_startread )
LROT_FUNCENTRY( read, ads1115_lua_read )
#ifdef ADS1115_INCLUDE_TEST_FUNCTION
{ LSTRKEY( "test_volt_conversion" ), LFUNCVAL(test_volt_conversion)},
LROT_FUNCENTRY( test_volt_conversion, test_volt_conversion )
#endif
{ LSTRKEY( "__index" ), LROVAL(ads1115_instance_map) },
{ LSTRKEY( "__gc" ), LFUNCVAL(ads1115_lua_delete) },
{ LNILKEY, LNILVAL }
};
LROT_TABENTRY( "__index", ads1115_instance )
LROT_FUNCENTRY( __gc, ads1115_lua_delete )
LROT_END(ads1115_instance, ads1115_instance, LROT_MASK_GC_INDEX )
int luaopen_ads1115(lua_State *L) {
luaL_rometatable(L, metatable_name, (void *)ads1115_instance_map);
luaL_rometatable(L, metatable_name, LROT_TABLEREF(ads1115_instance));
return 0;
}
NODEMCU_MODULE(ADS1115, "ads1115", ads1115_map, luaopen_ads1115);
NODEMCU_MODULE(ADS1115, "ads1115", ads1115, luaopen_ads1115);
......@@ -76,10 +76,10 @@ static int adxl345_read(lua_State* L) {
return 3;
}
static const LUA_REG_TYPE adxl345_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( adxl345_read )},
{ LSTRKEY( "setup" ), LFUNCVAL( adxl345_setup )},
{ LNILKEY, LNILVAL}
};
LROT_BEGIN(adxl345)
LROT_FUNCENTRY( read, adxl345_read )
LROT_FUNCENTRY( setup, adxl345_setup )
LROT_END( adxl345, NULL, 0 )
NODEMCU_MODULE(ADXL345, "adxl345", adxl345_map, NULL);
NODEMCU_MODULE(ADXL345, "adxl345", adxl345, NULL);
......@@ -129,10 +129,10 @@ static int am2320_read(lua_State* L)
return 2;
}
static const LUA_REG_TYPE am2320_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( am2320_read )},
{ LSTRKEY( "setup" ), LFUNCVAL( am2320_setup )},
{ LNILKEY, LNILVAL}
};
LROT_BEGIN(am2320)
LROT_FUNCENTRY( read, am2320_read )
LROT_FUNCENTRY( setup, am2320_setup )
LROT_END( am2320, NULL, 0 )
NODEMCU_MODULE(AM2320, "am2320", am2320_map, NULL);
NODEMCU_MODULE(AM2320, "am2320", am2320, NULL);
......@@ -101,15 +101,14 @@ static int apa102_write(lua_State* L) {
}
const LUA_REG_TYPE apa102_map[] =
{
{ LSTRKEY( "write" ), LFUNCVAL( apa102_write )},
{ LNILKEY, LNILVAL}
};
LROT_PUBLIC_BEGIN(apa102)
LROT_FUNCENTRY( write, apa102_write )
LROT_END( apa102, NULL, 0 )
LUALIB_API int luaopen_apa102(lua_State *L) {
LREGISTER(L, "apa102", apa102_map);
return 0;
}
NODEMCU_MODULE(APA102, "apa102", apa102_map, luaopen_apa102);
NODEMCU_MODULE(APA102, "apa102", apa102, luaopen_apa102);
......@@ -119,20 +119,20 @@ static int bit_clear( lua_State* L )
return 1;
}
static const LUA_REG_TYPE bit_map[] = {
{ LSTRKEY( "bnot" ), LFUNCVAL( bit_bnot ) },
{ LSTRKEY( "band" ), LFUNCVAL( bit_band ) },
{ LSTRKEY( "bor" ), LFUNCVAL( bit_bor ) },
{ LSTRKEY( "bxor" ), LFUNCVAL( bit_bxor ) },
{ LSTRKEY( "lshift" ), LFUNCVAL( bit_lshift ) },
{ LSTRKEY( "rshift" ), LFUNCVAL( bit_rshift ) },
{ LSTRKEY( "arshift" ), LFUNCVAL( bit_arshift ) },
{ LSTRKEY( "bit" ), LFUNCVAL( bit_bit ) },
{ LSTRKEY( "set" ), LFUNCVAL( bit_set ) },
{ LSTRKEY( "clear" ), LFUNCVAL( bit_clear ) },
{ LSTRKEY( "isset" ), LFUNCVAL( bit_isset ) },
{ LSTRKEY( "isclear" ), LFUNCVAL( bit_isclear ) },
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(BIT, "bit", bit_map, NULL);
LROT_BEGIN(bit)
LROT_FUNCENTRY( bnot, bit_bnot )
LROT_FUNCENTRY( band, bit_band )
LROT_FUNCENTRY( bor, bit_bor )
LROT_FUNCENTRY( bxor, bit_bxor )
LROT_FUNCENTRY( lshift, bit_lshift )
LROT_FUNCENTRY( rshift, bit_rshift )
LROT_FUNCENTRY( arshift, bit_arshift )
LROT_FUNCENTRY( bit, bit_bit )
LROT_FUNCENTRY( set, bit_set )
LROT_FUNCENTRY( clear, bit_clear )
LROT_FUNCENTRY( isset, bit_isset )
LROT_FUNCENTRY( isclear, bit_isclear )
LROT_END( bit, NULL, 0 )
NODEMCU_MODULE(BIT, "bit", bit, NULL);
......@@ -169,24 +169,24 @@ static int bloom_create(lua_State *L) {
return 1;
}
static const LUA_REG_TYPE bloom_filter_map[] = {
{ LSTRKEY( "add" ), LFUNCVAL( bloom_filter_add ) },
{ LSTRKEY( "check" ), LFUNCVAL( bloom_filter_check ) },
{ LSTRKEY( "reset" ), LFUNCVAL( bloom_filter_reset ) },
{ LSTRKEY( "info" ), LFUNCVAL( bloom_filter_info ) },
{ LSTRKEY( "__index" ), LROVAL( bloom_filter_map ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(bloom_filter)
LROT_FUNCENTRY( add, bloom_filter_add )
LROT_FUNCENTRY( check, bloom_filter_check )
LROT_FUNCENTRY( reset, bloom_filter_reset )
LROT_FUNCENTRY( info, bloom_filter_info )
LROT_TABENTRY( __index, bloom_filter )
LROT_END( bloom_filter, bloom_filter, LROT_MASK_INDEX )
// Module function map
static const LUA_REG_TYPE bloom_map[] = {
{ LSTRKEY( "create" ), LFUNCVAL( bloom_create ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(bloom)
LROT_FUNCENTRY( create, bloom_create )
LROT_END( bloom, NULL, 0 )
LUALIB_API int bloom_open(lua_State *L) {
luaL_rometatable(L, "bloom.filter", (void *)bloom_filter_map);
luaL_rometatable(L, "bloom.filter", LROT_TABLEREF(bloom_filter));
return 1;
}
NODEMCU_MODULE(BLOOM, "bloom", bloom_map, bloom_open);
NODEMCU_MODULE(BLOOM, "bloom", bloom, bloom_open);
......@@ -470,17 +470,17 @@ static int bme280_lua_dewpoint(lua_State* L) {
return 1;
}
static const LUA_REG_TYPE bme280_map[] = {
{ LSTRKEY( "setup" ), LFUNCVAL(bme280_lua_setup)},
{ LSTRKEY( "temp" ), LFUNCVAL(bme280_lua_temp)},
{ LSTRKEY( "baro" ), LFUNCVAL(bme280_lua_baro)},
{ LSTRKEY( "humi" ), LFUNCVAL(bme280_lua_humi)},
{ LSTRKEY( "startreadout" ), LFUNCVAL(bme280_lua_startreadout)},
{ LSTRKEY( "qfe2qnh" ), LFUNCVAL(bme280_lua_qfe2qnh)},
{ LSTRKEY( "altitude" ), LFUNCVAL(bme280_lua_altitude)},
{ LSTRKEY( "dewpoint" ), LFUNCVAL(bme280_lua_dewpoint)},
{ LSTRKEY( "read" ), LFUNCVAL(bme280_lua_read)},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(BME280, "bme280", bme280_map, NULL);
LROT_BEGIN(bme280)
LROT_FUNCENTRY( setup, bme280_lua_setup )
LROT_FUNCENTRY( temp, bme280_lua_temp )
LROT_FUNCENTRY( baro, bme280_lua_baro )
LROT_FUNCENTRY( humi, bme280_lua_humi )
LROT_FUNCENTRY( startreadout, bme280_lua_startreadout )
LROT_FUNCENTRY( qfe2qnh, bme280_lua_qfe2qnh )
LROT_FUNCENTRY( altitude, bme280_lua_altitude )
LROT_FUNCENTRY( dewpoint, bme280_lua_dewpoint )
LROT_FUNCENTRY( read, bme280_lua_read )
LROT_END( bme280, NULL, 0 )
NODEMCU_MODULE(BME280, "bme280", bme280, NULL);
......@@ -534,14 +534,14 @@ static int bme680_lua_dewpoint(lua_State* L) {
return 1;
}
static const LUA_REG_TYPE bme680_map[] = {
{ LSTRKEY( "setup" ), LFUNCVAL(bme680_lua_setup)},
{ LSTRKEY( "startreadout" ), LFUNCVAL(bme680_lua_startreadout)},
{ LSTRKEY( "qfe2qnh" ), LFUNCVAL(bme680_lua_qfe2qnh)},
{ LSTRKEY( "altitude" ), LFUNCVAL(bme680_lua_altitude)},
{ LSTRKEY( "dewpoint" ), LFUNCVAL(bme680_lua_dewpoint)},
{ LSTRKEY( "read" ), LFUNCVAL(bme680_lua_read)},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(BME680, "bme680", bme680_map, NULL);
LROT_BEGIN(bme680)
LROT_FUNCENTRY( setup, bme680_lua_setup )
LROT_FUNCENTRY( startreadout, bme680_lua_startreadout )
LROT_FUNCENTRY( qfe2qnh, bme680_lua_qfe2qnh )
LROT_FUNCENTRY( altitude, bme680_lua_altitude )
LROT_FUNCENTRY( dewpoint, bme680_lua_dewpoint )
LROT_FUNCENTRY( read, bme680_lua_read )
LROT_END( bme680, NULL, 0 )
NODEMCU_MODULE(BME680, "bme680", bme680, NULL);
......@@ -169,12 +169,12 @@ static int bmp085_lua_pressure(lua_State* L) {
return 1;
}
static const LUA_REG_TYPE bmp085_map[] = {
{ LSTRKEY( "temperature" ), LFUNCVAL( bmp085_lua_temperature )},
{ LSTRKEY( "pressure" ), LFUNCVAL( bmp085_lua_pressure )},
{ LSTRKEY( "pressure_raw" ), LFUNCVAL( bmp085_lua_pressure_raw )},
{ LSTRKEY( "setup" ), LFUNCVAL( bmp085_setup )},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(BMP085, "bmp085", bmp085_map, NULL);
LROT_BEGIN(bmp085)
LROT_FUNCENTRY( temperature, bmp085_lua_temperature )
LROT_FUNCENTRY( pressure, bmp085_lua_pressure )
LROT_FUNCENTRY( pressure_raw, bmp085_lua_pressure_raw )
LROT_FUNCENTRY( setup, bmp085_setup )
LROT_END( bmp085, NULL, 0 )
NODEMCU_MODULE(BMP085, "bmp085", bmp085, NULL);
......@@ -556,48 +556,47 @@ static int coap_client_delete( lua_State* L )
}
// Module function map
static const LUA_REG_TYPE coap_server_map[] = {
{ LSTRKEY( "listen" ), LFUNCVAL( coap_server_listen ) },
{ LSTRKEY( "close" ), LFUNCVAL( coap_server_close ) },
{ LSTRKEY( "var" ), LFUNCVAL( coap_server_var ) },
{ LSTRKEY( "func" ), LFUNCVAL( coap_server_func ) },
{ LSTRKEY( "__gc" ), LFUNCVAL( coap_server_delete ) },
{ LSTRKEY( "__index" ), LROVAL( coap_server_map ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE coap_client_map[] = {
{ LSTRKEY( "get" ), LFUNCVAL( coap_client_get ) },
{ LSTRKEY( "post" ), LFUNCVAL( coap_client_post ) },
{ LSTRKEY( "put" ), LFUNCVAL( coap_client_put ) },
{ LSTRKEY( "delete" ), LFUNCVAL( coap_client_delete ) },
{ LSTRKEY( "__gc" ), LFUNCVAL( coap_client_gcdelete ) },
{ LSTRKEY( "__index" ), LROVAL( coap_client_map ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE coap_map[] =
{
{ LSTRKEY( "Server" ), LFUNCVAL( coap_createServer ) },
{ LSTRKEY( "Client" ), LFUNCVAL( coap_createClient ) },
{ LSTRKEY( "CON" ), LNUMVAL( COAP_TYPE_CON ) },
{ LSTRKEY( "NON" ), LNUMVAL( COAP_TYPE_NONCON ) },
{ LSTRKEY( "TEXT_PLAIN"), LNUMVAL( COAP_CONTENTTYPE_TEXT_PLAIN ) },
{ LSTRKEY( "LINKFORMAT"), LNUMVAL( COAP_CONTENTTYPE_APPLICATION_LINKFORMAT ) },
{ LSTRKEY( "XML"), LNUMVAL( COAP_CONTENTTYPE_APPLICATION_XML ) },
{ LSTRKEY( "OCTET_STREAM"), LNUMVAL( COAP_CONTENTTYPE_APPLICATION_OCTET_STREAM ) },
{ LSTRKEY( "EXI"), LNUMVAL( COAP_CONTENTTYPE_APPLICATION_EXI ) },
{ LSTRKEY( "JSON"), LNUMVAL( COAP_CONTENTTYPE_APPLICATION_JSON) },
{ LSTRKEY( "__metatable" ), LROVAL( coap_map ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(coap_server)
LROT_FUNCENTRY( listen, coap_server_listen )
LROT_FUNCENTRY( close, coap_server_close )
LROT_FUNCENTRY( var, coap_server_var )
LROT_FUNCENTRY( func, coap_server_func )
LROT_FUNCENTRY( __gc, coap_server_delete )
LROT_TABENTRY( __index, coap_server )
LROT_END( coap_server, coap_server, 0 )
LROT_BEGIN(coap_client)
LROT_FUNCENTRY( get, coap_client_get )
LROT_FUNCENTRY( post, coap_client_post )
LROT_FUNCENTRY( put, coap_client_put )
LROT_FUNCENTRY( delete, coap_client_delete )
LROT_FUNCENTRY( __gc, coap_client_gcdelete )
LROT_TABENTRY( __index, coap_client )
LROT_END( coap_client, coap_client, 0 )
LROT_BEGIN(coap)
LROT_FUNCENTRY( Server, coap_createServer )
LROT_FUNCENTRY( Client, coap_createClient )
LROT_NUMENTRY( CON, COAP_TYPE_CON )
LROT_NUMENTRY( NON, COAP_TYPE_NONCON )
LROT_NUMENTRY( TEXT_PLAIN, COAP_CONTENTTYPE_TEXT_PLAIN )
LROT_NUMENTRY( LINKFORMAT, COAP_CONTENTTYPE_APPLICATION_LINKFORMAT )
LROT_NUMENTRY( XML, COAP_CONTENTTYPE_APPLICATION_XML )
LROT_NUMENTRY( OCTET_STREAM, COAP_CONTENTTYPE_APPLICATION_OCTET_STREAM )
LROT_NUMENTRY( EXI, COAP_CONTENTTYPE_APPLICATION_EXI )
LROT_NUMENTRY( JSON, COAP_CONTENTTYPE_APPLICATION_JSON )
LROT_TABENTRY( __metatable, coap )
LROT_END( coap, coap, 0 )
int luaopen_coap( lua_State *L )
{
endpoint_setup();
luaL_rometatable(L, "coap_server", (void *)coap_server_map); // create metatable for coap_server
luaL_rometatable(L, "coap_client", (void *)coap_client_map); // create metatable for coap_client
luaL_rometatable(L, "coap_server", LROT_TABLEREF(coap_server));
luaL_rometatable(L, "coap_client", LROT_TABLEREF(coap_client));
return 0;
}
NODEMCU_MODULE(COAP, "coap", coap_map, luaopen_coap);
NODEMCU_MODULE(COAP, "coap", coap, luaopen_coap);
......@@ -234,13 +234,12 @@ static int cu_grb2hsv(lua_State *L) {
}
static const LUA_REG_TYPE color_utils_map[] =
{
{ LSTRKEY( "hsv2grb" ), LFUNCVAL( cu_hsv2grb )},
{ LSTRKEY( "hsv2grbw" ), LFUNCVAL( cu_hsv2grbw )},
{ LSTRKEY( "colorWheel" ), LFUNCVAL( cu_color_wheel )},
{ LSTRKEY( "grb2hsv" ), LFUNCVAL( cu_grb2hsv )},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(COLOR_UTILS, "color_utils", color_utils_map, NULL);
LROT_BEGIN(color_utils)
LROT_FUNCENTRY( hsv2grb, cu_hsv2grb )
LROT_FUNCENTRY( hsv2grbw, cu_hsv2grbw )
LROT_FUNCENTRY( colorWheel, cu_color_wheel )
LROT_FUNCENTRY( grb2hsv, cu_grb2hsv )
LROT_END( color_utils, NULL, 0 )
NODEMCU_MODULE(COLOR_UTILS, "color_utils", color_utils, NULL);
......@@ -224,20 +224,20 @@ static void cron_handle_tmr() {
cron_handle_time(tm.tm_mon + 1, tm.tm_mday, tm.tm_wday, tm.tm_hour, tm.tm_min);
}
static const LUA_REG_TYPE cronent_map[] = {
{ LSTRKEY( "schedule" ), LFUNCVAL( lcron_schedule ) },
{ LSTRKEY( "handler" ), LFUNCVAL( lcron_handler ) },
{ LSTRKEY( "unschedule" ), LFUNCVAL( lcron_unschedule ) },
{ LSTRKEY( "__gc" ), LFUNCVAL( lcron_delete ) },
{ LSTRKEY( "__index" ), LROVAL( cronent_map ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(cronent)
LROT_FUNCENTRY( schedule, lcron_schedule )
LROT_FUNCENTRY( handler, lcron_handler )
LROT_FUNCENTRY( unschedule, lcron_unschedule )
LROT_FUNCENTRY( __gc, lcron_delete )
LROT_TABENTRY( __index, cronent )
LROT_END( cronent, cronent, LROT_MASK_GC_INDEX )
LROT_BEGIN(cron)
LROT_FUNCENTRY( schedule, lcron_create )
LROT_FUNCENTRY( reset, lcron_reset )
LROT_END( cron, NULL, 0 )
static const LUA_REG_TYPE cron_map[] = {
{ LSTRKEY( "schedule" ), LFUNCVAL( lcron_create ) },
{ LSTRKEY( "reset" ), LFUNCVAL( lcron_reset ) },
{ LNILKEY, LNILVAL }
};
#include "pm/swtimer.h"
int luaopen_cron( lua_State *L ) {
......@@ -247,8 +247,8 @@ int luaopen_cron( lua_State *L ) {
//cron_handle_tmr determines when to execute a scheduled cron job
//My guess: To be sure to give the other modules required by cron enough time to get to a ready state, restart cron_timer.
os_timer_arm(&cron_timer, 1000, 0);
luaL_rometatable(L, "cron.entry", (void *)cronent_map);
luaL_rometatable(L, "cron.entry", LROT_TABLEREF(cronent));
return 0;
}
NODEMCU_MODULE(CRON, "cron", cron_map, luaopen_cron);
NODEMCU_MODULE(CRON, "cron", cron, luaopen_cron);
......@@ -383,34 +383,34 @@ static int lcrypto_decrypt (lua_State *L)
}
// Hash function map
static const LUA_REG_TYPE crypto_hash_map[] = {
{ LSTRKEY( "update" ), LFUNCVAL( crypto_hash_update ) },
{ LSTRKEY( "finalize" ), LFUNCVAL( crypto_hash_finalize ) },
{ LSTRKEY( "__index" ), LROVAL( crypto_hash_map ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(crypto_hash)
LROT_FUNCENTRY( update, crypto_hash_update )
LROT_FUNCENTRY( finalize, crypto_hash_finalize )
LROT_TABENTRY( __index, crypto_hash )
LROT_END( crypto_hash, crypto_hash, LROT_MASK_INDEX )
// Module function map
static const LUA_REG_TYPE crypto_map[] = {
{ LSTRKEY( "sha1" ), LFUNCVAL( crypto_sha1 ) },
{ LSTRKEY( "toBase64" ), LFUNCVAL( crypto_base64_encode ) },
{ LSTRKEY( "toHex" ), LFUNCVAL( crypto_hex_encode ) },
{ LSTRKEY( "mask" ), LFUNCVAL( crypto_mask ) },
{ LSTRKEY( "hash" ), LFUNCVAL( crypto_lhash ) },
{ LSTRKEY( "fhash" ), LFUNCVAL( crypto_flhash ) },
{ LSTRKEY( "new_hash" ), LFUNCVAL( crypto_new_hash ) },
{ LSTRKEY( "hmac" ), LFUNCVAL( crypto_lhmac ) },
{ LSTRKEY( "new_hmac" ), LFUNCVAL( crypto_new_hmac ) },
{ LSTRKEY( "encrypt" ), LFUNCVAL( lcrypto_encrypt ) },
{ LSTRKEY( "decrypt" ), LFUNCVAL( lcrypto_decrypt ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(crypto)
LROT_FUNCENTRY( sha1, crypto_sha1 )
LROT_FUNCENTRY( toBase64, crypto_base64_encode )
LROT_FUNCENTRY( toHex, crypto_hex_encode )
LROT_FUNCENTRY( mask, crypto_mask )
LROT_FUNCENTRY( hash, crypto_lhash )
LROT_FUNCENTRY( fhash, crypto_flhash )
LROT_FUNCENTRY( new_hash, crypto_new_hash )
LROT_FUNCENTRY( hmac, crypto_lhmac )
LROT_FUNCENTRY( new_hmac, crypto_new_hmac )
LROT_FUNCENTRY( encrypt, lcrypto_encrypt )
LROT_FUNCENTRY( decrypt, lcrypto_decrypt )
LROT_END( crypto, NULL, 0 )
int luaopen_crypto ( lua_State *L )
{
luaL_rometatable(L, "crypto.hash", (void *)crypto_hash_map); // create metatable for crypto.hash
luaL_rometatable(L, "crypto.hash", LROT_TABLEREF(crypto_hash));
return 0;
}
NODEMCU_MODULE(CRYPTO, "crypto", crypto_map, luaopen_crypto);
NODEMCU_MODULE(CRYPTO, "crypto", crypto, luaopen_crypto);
......@@ -99,14 +99,14 @@ static int dht_lapi_readxx( lua_State *L )
// }
// Module function map
static const LUA_REG_TYPE dht_map[] = {
{ LSTRKEY( "read" ), LFUNCVAL( dht_lapi_read ) },
{ LSTRKEY( "read11" ), LFUNCVAL( dht_lapi_read11 ) },
{ LSTRKEY( "readxx" ), LFUNCVAL( dht_lapi_readxx ) },
{ LSTRKEY( "OK" ), LNUMVAL( DHTLIB_OK ) },
{ LSTRKEY( "ERROR_CHECKSUM" ), LNUMVAL( DHTLIB_ERROR_CHECKSUM ) },
{ LSTRKEY( "ERROR_TIMEOUT" ), LNUMVAL( DHTLIB_ERROR_TIMEOUT ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(dht)
LROT_FUNCENTRY( read, dht_lapi_read )
LROT_FUNCENTRY( read11, dht_lapi_read11 )
LROT_FUNCENTRY( readxx, dht_lapi_readxx )
LROT_NUMENTRY( OK, DHTLIB_OK )
LROT_NUMENTRY( ERROR_CHECKSUM, DHTLIB_ERROR_CHECKSUM )
LROT_NUMENTRY( ERROR_TIMEOUT, DHTLIB_ERROR_TIMEOUT )
LROT_END( dht, NULL, 0 )
NODEMCU_MODULE(DHT, "dht", dht_map, NULL);
NODEMCU_MODULE(DHT, "dht", dht, NULL);
......@@ -153,12 +153,12 @@ static int do_func (lua_State *L, uint8 * (*conv_func)(lua_State *, const uint8
DECLARE_FUNCTION(toHex);
// Module function map
static const LUA_REG_TYPE encoder_map[] = {
{ LSTRKEY("fromBase64"), LFUNCVAL(encoder_fromBase64) },
{ LSTRKEY("toBase64"), LFUNCVAL(encoder_toBase64) },
{ LSTRKEY("fromHex"), LFUNCVAL(encoder_fromHex) },
{ LSTRKEY("toHex"), LFUNCVAL(encoder_toHex) },
{ LNILKEY, LNILVAL }
};
NODEMCU_MODULE(ENCODER, "encoder", encoder_map, NULL);
LROT_BEGIN(encoder)
LROT_FUNCENTRY( fromBase64, encoder_fromBase64 )
LROT_FUNCENTRY( toBase64, encoder_toBase64 )
LROT_FUNCENTRY( fromHex, encoder_fromHex )
LROT_FUNCENTRY( toHex, encoder_toHex )
LROT_END( encoder, NULL, 0 )
NODEMCU_MODULE(ENCODER, "encoder", encoder, NULL);
......@@ -1784,11 +1784,11 @@ static int enduser_setup_stop(lua_State* L)
}
static const LUA_REG_TYPE enduser_setup_map[] = {
{ LSTRKEY( "manual" ), LFUNCVAL( enduser_setup_manual )},
{ LSTRKEY( "start" ), LFUNCVAL( enduser_setup_start )},
{ LSTRKEY( "stop" ), LFUNCVAL( enduser_setup_stop )},
{ LNILKEY, LNILVAL}
};
NODEMCU_MODULE(ENDUSER_SETUP, "enduser_setup", enduser_setup_map, NULL);
LROT_BEGIN(enduser_setup)
LROT_FUNCENTRY( manual, enduser_setup_manual )
LROT_FUNCENTRY( start, enduser_setup_start )
LROT_FUNCENTRY( stop, enduser_setup_stop )
LROT_END( enduser_setup, NULL, 0 )
NODEMCU_MODULE(ENDUSER_SETUP, "enduser_setup", enduser_setup, NULL);
......@@ -644,64 +644,68 @@ static int file_vol_umount( lua_State *L )
}
static const LUA_REG_TYPE file_obj_map[] =
{
{ LSTRKEY( "close" ), LFUNCVAL( file_close ) },
{ LSTRKEY( "read" ), LFUNCVAL( file_read ) },
{ LSTRKEY( "readline" ), LFUNCVAL( file_readline ) },
{ LSTRKEY( "write" ), LFUNCVAL( file_write ) },
{ LSTRKEY( "writeline" ), LFUNCVAL( file_writeline ) },
{ LSTRKEY( "seek" ), LFUNCVAL( file_seek ) },
{ LSTRKEY( "flush" ), LFUNCVAL( file_flush ) },
{ LSTRKEY( "__gc" ), LFUNCVAL( file_obj_free ) },
{ LSTRKEY( "__index" ), LROVAL( file_obj_map ) },
{ LNILKEY, LNILVAL }
};
static const LUA_REG_TYPE file_vol_map[] =
{
{ LSTRKEY( "umount" ), LFUNCVAL( file_vol_umount )},
//{ LSTRKEY( "getfree" ), LFUNCVAL( file_vol_getfree )},
//{ LSTRKEY( "getlabel" ), LFUNCVAL( file_vol_getlabel )},
//{ LSTRKEY( "__gc" ), LFUNCVAL( file_vol_free ) },
{ LSTRKEY( "__index" ), LROVAL( file_vol_map ) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(file_obj)
LROT_FUNCENTRY( close, file_close )
LROT_FUNCENTRY( read, file_read )
LROT_FUNCENTRY( readline, file_readline )
LROT_FUNCENTRY( write, file_write )
LROT_FUNCENTRY( writeline, file_writeline )
LROT_FUNCENTRY( seek, file_seek )
LROT_FUNCENTRY( flush, file_flush )
LROT_FUNCENTRY( __gc, file_obj_free )
LROT_TABENTRY( __index, file_obj )
LROT_END( file_obj, file_obj, LROT_MASK_GC_INDEX )
LROT_BEGIN(file_vol)
LROT_FUNCENTRY( umount, file_vol_umount )
// LROT_FUNCENTRY( getfree, file_vol_getfree )
// LROT_FUNCENTRY( getlabel, file_vol_getlabel )
// LROT_FUNCENTRY( __gc, file_vol_free )
LROT_TABENTRY( __index, file_vol )
LROT_END( file_vol, file_vol, LROT_MASK_GC_INDEX )
// Module function map
static const LUA_REG_TYPE file_map[] = {
{ LSTRKEY( "list" ), LFUNCVAL( file_list ) },
{ LSTRKEY( "open" ), LFUNCVAL( file_open ) },
{ LSTRKEY( "close" ), LFUNCVAL( file_close ) },
{ LSTRKEY( "write" ), LFUNCVAL( file_write ) },
{ LSTRKEY( "writeline" ), LFUNCVAL( file_writeline ) },
{ LSTRKEY( "read" ), LFUNCVAL( file_read ) },
{ LSTRKEY( "readline" ), LFUNCVAL( file_readline ) },
#ifdef BUILD_SPIFFS
{ LSTRKEY( "format" ), LFUNCVAL( file_format ) },
{ LSTRKEY( "fscfg" ), LFUNCVAL( file_fscfg ) },
#define LROT_FUNCENTRY_S(n,f) LROT_FUNCENTRY(n,f)
#else
#define LROT_FUNCENTRY_S(n,f)
#endif
{ LSTRKEY( "remove" ), LFUNCVAL( file_remove ) },
{ LSTRKEY( "seek" ), LFUNCVAL( file_seek ) },
{ LSTRKEY( "flush" ), LFUNCVAL( file_flush ) },
{ LSTRKEY( "rename" ), LFUNCVAL( file_rename ) },
{ LSTRKEY( "exists" ), LFUNCVAL( file_exists ) },
{ LSTRKEY( "getcontents" ), LFUNCVAL( file_getfile ) },
{ LSTRKEY( "putcontents" ), LFUNCVAL( file_putfile ) },
{ LSTRKEY( "fsinfo" ), LFUNCVAL( file_fsinfo ) },
{ LSTRKEY( "on" ), LFUNCVAL( file_on ) },
{ LSTRKEY( "stat" ), LFUNCVAL( file_stat ) },
#ifdef BUILD_FATFS
{ LSTRKEY( "mount" ), LFUNCVAL( file_mount ) },
{ LSTRKEY( "chdir" ), LFUNCVAL( file_chdir ) },
#define LROT_FUNCENTRY_F(n,f) LROT_FUNCENTRY(n,f)
#else
#define LROT_FUNCENTRY_F(n,f)
#endif
{ LNILKEY, LNILVAL }
};
// Module function map
LROT_BEGIN(file)
LROT_FUNCENTRY( list, file_list )
LROT_FUNCENTRY( open, file_open )
LROT_FUNCENTRY( close, file_close )
LROT_FUNCENTRY( write, file_write )
LROT_FUNCENTRY( writeline, file_writeline )
LROT_FUNCENTRY( read, file_read )
LROT_FUNCENTRY( readline, file_readline )
LROT_FUNCENTRY_S( format, file_format )
LROT_FUNCENTRY_S( fscfg, file_fscfg )
LROT_FUNCENTRY( remove, file_remove )
LROT_FUNCENTRY( seek, file_seek )
LROT_FUNCENTRY( flush, file_flush )
LROT_FUNCENTRY( rename, file_rename )
LROT_FUNCENTRY( exists, file_exists )
LROT_FUNCENTRY( getcontents, file_getfile )
LROT_FUNCENTRY( putcontents, file_putfile )
LROT_FUNCENTRY( fsinfo, file_fsinfo )
LROT_FUNCENTRY( on, file_on )
LROT_FUNCENTRY( stat, file_stat )
LROT_FUNCENTRY_F( mount, file_mount )
LROT_FUNCENTRY_F( chdir, file_chdir )
LROT_END( file, NULL, 0 )
int luaopen_file( lua_State *L ) {
luaL_rometatable( L, "file.vol", (void *)file_vol_map );
luaL_rometatable( L, "file.obj", (void *)file_obj_map );
luaL_rometatable( L, "file.vol", LROT_TABLEREF(file_vol));
luaL_rometatable( L, "file.obj", LROT_TABLEREF(file_obj));
return 0;
}
NODEMCU_MODULE(FILE, "file", file_map, luaopen_file);
NODEMCU_MODULE(FILE, "file", file, luaopen_file);
......@@ -39,11 +39,11 @@ static int lgdbstub_open(lua_State *L) {
}
// Module function map
static const LUA_REG_TYPE gdbstub_map[] = {
{ LSTRKEY( "brk" ), LFUNCVAL( lgdbstub_break ) },
{ LSTRKEY( "gdboutput" ), LFUNCVAL( lgdbstub_gdboutput) },
{ LSTRKEY( "open" ), LFUNCVAL( lgdbstub_open) },
{ LNILKEY, LNILVAL }
};
LROT_BEGIN(gdbstub)
LROT_FUNCENTRY( brk, lgdbstub_break )
LROT_FUNCENTRY( gdboutput, lgdbstub_gdboutput )
LROT_FUNCENTRY( open, lgdbstub_open )
LROT_END( gdbstub, NULL, 0 )
NODEMCU_MODULE(GDBSTUB, "gdbstub", gdbstub_map, NULL);
NODEMCU_MODULE(GDBSTUB, "gdbstub", gdbstub, NULL);
......@@ -319,32 +319,32 @@ static int lgpio_serout( lua_State* L )
#undef DELAY_TABLE_MAX_LEN
#ifdef LUA_USE_MODULES_GPIO_PULSE
extern const LUA_REG_TYPE gpio_pulse_map[];
LROT_EXTERN(gpio_pulse);
extern int gpio_pulse_init(lua_State *);
#endif
// Module function map
static const LUA_REG_TYPE gpio_map[] = {
{ LSTRKEY( "mode" ), LFUNCVAL( lgpio_mode ) },
{ LSTRKEY( "read" ), LFUNCVAL( lgpio_read ) },
{ LSTRKEY( "write" ), LFUNCVAL( lgpio_write ) },
{ LSTRKEY( "serout" ), LFUNCVAL( lgpio_serout ) },
LROT_BEGIN(gpio)
LROT_FUNCENTRY( mode, lgpio_mode )
LROT_FUNCENTRY( read, lgpio_read )
LROT_FUNCENTRY( write, lgpio_write )
LROT_FUNCENTRY( serout, lgpio_serout )
#ifdef LUA_USE_MODULES_GPIO_PULSE
{ LSTRKEY( "pulse" ), LROVAL( gpio_pulse_map ) }, //declared in gpio_pulse.c
LROT_TABENTRY( pulse, gpio_pulse )
#endif
#ifdef GPIO_INTERRUPT_ENABLE
{ LSTRKEY( "trig" ), LFUNCVAL( lgpio_trig ) },
{ LSTRKEY( "INT" ), LNUMVAL( INTERRUPT ) },
LROT_FUNCENTRY( trig, lgpio_trig )
LROT_NUMENTRY( INT, INTERRUPT )
#endif
{ LSTRKEY( "OUTPUT" ), LNUMVAL( OUTPUT ) },
{ LSTRKEY( "OPENDRAIN" ), LNUMVAL( OPENDRAIN ) },
{ LSTRKEY( "INPUT" ), LNUMVAL( INPUT ) },
{ LSTRKEY( "HIGH" ), LNUMVAL( HIGH ) },
{ LSTRKEY( "LOW" ), LNUMVAL( LOW ) },
{ LSTRKEY( "FLOAT" ), LNUMVAL( FLOAT ) },
{ LSTRKEY( "PULLUP" ), LNUMVAL( PULLUP ) },
{ LNILKEY, LNILVAL }
};
LROT_NUMENTRY( OUTPUT, OUTPUT )
LROT_NUMENTRY( OPENDRAIN, OPENDRAIN )
LROT_NUMENTRY( INPUT, INPUT )
LROT_NUMENTRY( HIGH, HIGH )
LROT_NUMENTRY( LOW, LOW )
LROT_NUMENTRY( FLOAT, FLOAT )
LROT_NUMENTRY( PULLUP, PULLUP )
LROT_END( gpio, NULL, 0 )
int luaopen_gpio( lua_State *L ) {
#ifdef LUA_USE_MODULES_GPIO_PULSE
......@@ -362,4 +362,4 @@ int luaopen_gpio( lua_State *L ) {
return 0;
}
NODEMCU_MODULE(GPIO, "gpio", gpio_map, luaopen_gpio);
NODEMCU_MODULE(GPIO, "gpio", gpio, luaopen_gpio);
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