From b773290b8cae175e1d25e1de8319fa78e4a586de Mon Sep 17 00:00:00 2001
From: TerryE <terry@ellisons.org.uk>
Date: Sun, 13 Dec 2015 02:29:37 +0000
Subject: [PATCH] Major cleanup of module registration pass 2.

carrying on Johny's edits as per my comments on #810
---
 app/modules/adc.c           |  13 +--
 app/modules/auxmods.h       |  23 -----
 app/modules/bit.c           |   4 +
 app/modules/bmp085.c        |  16 ++--
 app/modules/cjson.c         |  61 +++++++-------
 app/modules/coap.c          |  53 ++++++------
 app/modules/crypto.c        |  20 +++--
 app/modules/dht.c           |  22 ++---
 app/modules/enduser_setup.c |   7 +-
 app/modules/file.c          |  39 ++++-----
 app/modules/gpio.c          |  30 +++----
 app/modules/hx711.c         |   9 +-
 app/modules/i2c.c           |  29 +++----
 app/modules/mqtt.c          |  29 +++----
 app/modules/net.c           |  85 +++++++++----------
 app/modules/ow.c            |  40 ++++-----
 app/modules/pwm.c           |  23 ++---
 app/modules/rc.c            |   8 +-
 app/modules/rtcfifo.c       |   7 +-
 app/modules/rtcmem.c        |  10 ++-
 app/modules/rtctime.c       |  16 ++--
 app/modules/sntp.c          |  10 ++-
 app/modules/spi.c           |  29 +++----
 app/modules/tmr.c           |  36 ++++----
 app/modules/tsl2561.c       |  45 +++++-----
 app/modules/u8g.c           | 162 ++++++++++++++++++------------------
 app/modules/uart.c          |  17 ++--
 app/modules/wifi.c          | 139 +++++++++++++++----------------
 app/platform/platform.h     |  16 ++++
 29 files changed, 515 insertions(+), 483 deletions(-)
 delete mode 100644 app/modules/auxmods.h

diff --git a/app/modules/adc.c b/app/modules/adc.c
index a0d24870..aedd16e1 100644
--- a/app/modules/adc.c
+++ b/app/modules/adc.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #include "c_types.h"
@@ -26,14 +25,16 @@ static int adc_readvdd33( lua_State* L )
 }
 
 // Module function map
-const LUA_REG_TYPE adc_map[] = 
-{
-  { LSTRKEY( "read" ), LFUNCVAL( adc_sample ) },
+const LUA_REG_TYPE adc_map[] = {
+  { LSTRKEY( "read" ),      LFUNCVAL( adc_sample ) },
   { LSTRKEY( "readvdd33" ), LFUNCVAL( adc_readvdd33) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_adc( lua_State *L )
-{
+LUALIB_API int luaopen_adc( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+# error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/auxmods.h b/app/modules/auxmods.h
deleted file mode 100644
index 12a67f41..00000000
--- a/app/modules/auxmods.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Auxiliary Lua modules. All of them are declared here, then each platform
-// decides what module(s) to register in the src/platform/xxxxx/platform_conf.h file
-// FIXME: no longer platform_conf.h - either CPU header file, or board file
-
-#ifndef __AUXMODS_H__
-#define __AUXMODS_H__
-
-// Helper macros
-#define MOD_CHECK_ID( mod, id )\
-  if( !platform_ ## mod ## _exists( id ) )\
-    return luaL_error( L, #mod" %d does not exist", ( unsigned )id )
-
-#define MOD_CHECK_TIMER( id )\
-  if( id == PLATFORM_TIMER_SYS_ID && !platform_timer_sys_available() )\
-    return luaL_error( L, "the system timer is not available on this platform" );\
-  if( !platform_timer_exists( id ) )\
-    return luaL_error( L, "timer %d does not exist", ( unsigned )id )\
-
-#define MOD_CHECK_RES_ID( mod, id, resmod, resid )\
-  if( !platform_ ## mod ## _check_ ## resmod ## _id( id, resid ) )\
-    return luaL_error( L, #resmod" %d not valid with " #mod " %d", ( unsigned )resid, ( unsigned )id )
-
-#endif
diff --git a/app/modules/bit.c b/app/modules/bit.c
index 31ae96d3..d6914457 100644
--- a/app/modules/bit.c
+++ b/app/modules/bit.c
@@ -136,5 +136,9 @@ const LUA_REG_TYPE bit_map[] = {
 };
 
 LUALIB_API int luaopen_bit (lua_State *L) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+# error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/bmp085.c b/app/modules/bmp085.c
index d75379e8..57a73bc1 100644
--- a/app/modules/bmp085.c
+++ b/app/modules/bmp085.c
@@ -183,16 +183,18 @@ static int ICACHE_FLASH_ATTR bmp085_lua_pressure(lua_State* L) {
     return 1;
 }
 
-const LUA_REG_TYPE bmp085_map[] =
-{
-    { LSTRKEY( "temperature" ), LFUNCVAL( bmp085_lua_temperature )},
-    { LSTRKEY( "pressure" ), LFUNCVAL( bmp085_lua_pressure )},
+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( "init" ), LFUNCVAL( bmp085_init )},
+    { LSTRKEY( "init" ),         LFUNCVAL( bmp085_init )},
     { LNILKEY, LNILVAL}
 };
 
 LUALIB_API int luaopen_bmp085(lua_State *L) {
-    return 0;
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
+  return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
-
diff --git a/app/modules/cjson.c b/app/modules/cjson.c
index 73a49dbf..23947a5d 100644
--- a/app/modules/cjson.c
+++ b/app/modules/cjson.c
@@ -1528,37 +1528,7 @@ static int json_protect_conversion(lua_State *l)
      * errors are memory related */
     return luaL_error(l, "Memory allocation error in CJSON protected call");
 }
-#endif
 
-// Module function map
-const LUA_REG_TYPE cjson_map[] = 
-{
-  { LSTRKEY( "encode" ), LFUNCVAL( json_encode ) },
-  { LSTRKEY( "decode" ), LFUNCVAL( json_decode ) },
-  // { LSTRKEY( "encode_sparse_array" ), LFUNCVAL( json_cfg_encode_sparse_array ) },
-  // { LSTRKEY( "encode_max_depth" ), LFUNCVAL( json_cfg_encode_max_depth ) },
-  // { LSTRKEY( "decode_max_depth" ), LFUNCVAL( json_cfg_decode_max_depth ) },
-  // { LSTRKEY( "encode_number_precision" ), LFUNCVAL( json_cfg_encode_number_precision ) },
-  // { LSTRKEY( "encode_keep_buffer" ), LFUNCVAL( json_cfg_encode_keep_buffer ) },
-  // { LSTRKEY( "encode_invalid_numbers" ), LFUNCVAL( json_cfg_encode_invalid_numbers ) },
-  // { LSTRKEY( "decode_invalid_numbers" ), LFUNCVAL( json_cfg_decode_invalid_numbers ) },
-  // { LSTRKEY( "new" ), LFUNCVAL( lua_cjson_new ) },
-  { LNILKEY, LNILVAL }
-};
-
-LUALIB_API int luaopen_cjson( lua_State *L )
-{
-  cjson_mem_setlua (L);
-
-  /* Initialise number conversions */
-  // fpconv_init();         // not needed for a specific cpu.
-  if(-1==cfg_init(&_cfg)){
-    return luaL_error(L, "BUG: Unable to init config for cjson");;
-  }
-  return 0;
-}
-
-#if 0
 /* Return cjson module table */
 static int lua_cjson_new(lua_State *l)
 {
@@ -1628,5 +1598,36 @@ int luaopen_cjson_safe(lua_State *l)
     return 1;
 }
 #endif
+
+// Module function map
+const LUA_REG_TYPE cjson_map[] = {
+  { LSTRKEY( "encode" ),                  LFUNCVAL( json_encode ) },
+  { LSTRKEY( "decode" ),                  LFUNCVAL( json_decode ) },
+//{ LSTRKEY( "encode_sparse_array" ),     LFUNCVAL( json_cfg_encode_sparse_array ) },
+//{ LSTRKEY( "encode_max_depth" ),        LFUNCVAL( json_cfg_encode_max_depth ) },
+//{ LSTRKEY( "decode_max_depth" ),        LFUNCVAL( json_cfg_decode_max_depth ) },
+//{ LSTRKEY( "encode_number_precision" ), LFUNCVAL( json_cfg_encode_number_precision ) },
+//{ LSTRKEY( "encode_keep_buffer" ),      LFUNCVAL( json_cfg_encode_keep_buffer ) },
+//{ LSTRKEY( "encode_invalid_numbers" ),  LFUNCVAL( json_cfg_encode_invalid_numbers ) },
+//{ LSTRKEY( "decode_invalid_numbers" ),  LFUNCVAL( json_cfg_decode_invalid_numbers ) },
+//{ LSTRKEY( "new" ),                     LFUNCVAL( lua_cjson_new ) },
+  { LNILKEY, LNILVAL }
+};
+
+LUALIB_API int luaopen_cjson( lua_State *L )
+{
+  cjson_mem_setlua (L);
+
+  /* Initialise number conversions */
+  // fpconv_init();         // not needed for a specific cpu.
+  if(-1==cfg_init(&_cfg)){
+    return luaL_error(L, "BUG: Unable to init config for cjson");;
+  }
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
+  return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
+}
 /* vi:ai et sw=4 ts=4:
  */
diff --git a/app/modules/coap.c b/app/modules/coap.c
index 6da5cb4f..94d2b670 100644
--- a/app/modules/coap.c
+++ b/app/modules/coap.c
@@ -558,41 +558,38 @@ 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 ) },
+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 ) },
+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 }
 };
 
 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( "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( "EXI"),          LNUMVAL( COAP_CONTENTTYPE_APPLICATION_EXI ) },
+  { LSTRKEY( "JSON"),         LNUMVAL( COAP_CONTENTTYPE_APPLICATION_JSON) },
   { LSTRKEY( "__metatable" ), LROVAL( coap_map ) },
   { LNILKEY, LNILVAL }
 };
@@ -602,5 +599,9 @@ LUALIB_API 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  
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/crypto.c b/app/modules/crypto.c
index 7557dd14..e9067495 100644
--- a/app/modules/crypto.c
+++ b/app/modules/crypto.c
@@ -150,18 +150,20 @@ static int crypto_lhmac (lua_State *L)
 
 
 // Module function map
-const LUA_REG_TYPE crypto_map[] =
-{
-  { LSTRKEY( "sha1" ), LFUNCVAL( crypto_sha1 ) },
+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( "hmac"   ), LFUNCVAL( crypto_lhmac ) },
+  { LSTRKEY( "toHex" ),    LFUNCVAL( crypto_hex_encode ) },
+  { LSTRKEY( "mask" ),     LFUNCVAL( crypto_mask ) },
+  { LSTRKEY( "hash"   ),   LFUNCVAL( crypto_lhash ) },
+  { LSTRKEY( "hmac"   ),   LFUNCVAL( crypto_lhmac ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_crypto( lua_State *L )
-{
+LUALIB_API int luaopen_crypto( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/dht.c b/app/modules/dht.c
index 3d7067ec..c951341f 100644
--- a/app/modules/dht.c
+++ b/app/modules/dht.c
@@ -1,8 +1,8 @@
 // Module for interfacing with the DHTxx sensors (xx = 11-21-22-33-44).
 
 #include "lauxlib.h"
-#include "auxmods.h"
 #include "lrodefs.h"
+#include "platform.h"
 #include "cpu_esp8266.h"
 #include "dht.h"
 
@@ -99,18 +99,20 @@ static int dht_lapi_readxx( lua_State *L )
 // }
 
 // Module function map
-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 ) },
+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 ) },
+  { LSTRKEY( "ERROR_TIMEOUT" ),  LNUMVAL( DHTLIB_ERROR_TIMEOUT ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_dht( lua_State *L )
-{
+LUALIB_API int luaopen_dht( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/enduser_setup.c b/app/modules/enduser_setup.c
index d1cb83b5..a7b06a57 100644
--- a/app/modules/enduser_setup.c
+++ b/app/modules/enduser_setup.c
@@ -927,14 +927,17 @@ static int enduser_setup_stop(lua_State* L)
 }
 
 
-const LUA_REG_TYPE enduser_setup_map[] =
-{
+const LUA_REG_TYPE enduser_setup_map[] = {
   { LSTRKEY( "start" ), LFUNCVAL( enduser_setup_start )},
   { LSTRKEY( "stop" ),  LFUNCVAL( enduser_setup_stop  )},
   { LNILKEY, LNILVAL}
 };
 
 LUALIB_API int luaopen_enduser_setup(lua_State *L) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
 
diff --git a/app/modules/file.c b/app/modules/file.c
index e41e4841..80f8ec54 100644
--- a/app/modules/file.c
+++ b/app/modules/file.c
@@ -296,29 +296,30 @@ static int file_writeline( lua_State* L )
 }
 
 // Module function map
-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 ) },
+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 ) },
-  { LSTRKEY( "format" ), LFUNCVAL( file_format ) },
-#if defined(BUILD_WOFS)
-#elif defined(BUILD_SPIFFS)
-  { LSTRKEY( "remove" ), LFUNCVAL( file_remove ) },
-  { LSTRKEY( "seek" ), LFUNCVAL( file_seek ) },
-  { LSTRKEY( "flush" ), LFUNCVAL( file_flush ) },
-  // { LSTRKEY( "check" ), LFUNCVAL( file_check ) },
-  { LSTRKEY( "rename" ), LFUNCVAL( file_rename ) },
-  { LSTRKEY( "fsinfo" ), LFUNCVAL( file_fsinfo ) },
+  { LSTRKEY( "read" ),      LFUNCVAL( file_read ) },
+  { LSTRKEY( "readline" ),  LFUNCVAL( file_readline ) },
+  { LSTRKEY( "format" ),    LFUNCVAL( file_format ) },
+#if defined(BUILD_SPIFFS) && !defined(BUILD_WOFS)
+  { LSTRKEY( "remove" ),    LFUNCVAL( file_remove ) },
+  { LSTRKEY( "seek" ),      LFUNCVAL( file_seek ) },
+  { LSTRKEY( "flush" ),     LFUNCVAL( file_flush ) },
+//{ LSTRKEY( "check" ),     LFUNCVAL( file_check ) },
+  { LSTRKEY( "rename" ),    LFUNCVAL( file_rename ) },
+  { LSTRKEY( "fsinfo" ),    LFUNCVAL( file_fsinfo ) },
 #endif
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_file( lua_State *L )
-{
+LUALIB_API int luaopen_file( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/gpio.c b/app/modules/gpio.c
index 49b1507c..d19c0220 100644
--- a/app/modules/gpio.c
+++ b/app/modules/gpio.c
@@ -1,7 +1,6 @@
 // Module for interfacing with GPIO
 
 #include "lauxlib.h"
-#include "auxmods.h"
 #include "platform.h"
 #include "lrodefs.h"
 
@@ -221,27 +220,25 @@ static int lgpio_serout( lua_State* L )
 #undef DELAY_TABLE_MAX_LEN
 
 // Module function map
-const LUA_REG_TYPE gpio_map[] = 
-{
-  { LSTRKEY( "mode" ), LFUNCVAL( lgpio_mode ) },
-  { LSTRKEY( "read" ), LFUNCVAL( lgpio_read ) },
-  { LSTRKEY( "write" ), LFUNCVAL( lgpio_write ) },
+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 ) },
 #ifdef GPIO_INTERRUPT_ENABLE
-  { LSTRKEY( "trig" ), LFUNCVAL( lgpio_trig ) },
-  { LSTRKEY( "INT" ), LNUMVAL( INTERRUPT ) },
+  { LSTRKEY( "trig" ),   LFUNCVAL( lgpio_trig ) },
+  { LSTRKEY( "INT" ),    LNUMVAL( INTERRUPT ) },
 #endif
   { LSTRKEY( "OUTPUT" ), LNUMVAL( OUTPUT ) },
-  { LSTRKEY( "INPUT" ), LNUMVAL( INPUT ) },
-  { LSTRKEY( "HIGH" ), LNUMVAL( HIGH ) },
-  { LSTRKEY( "LOW" ), LNUMVAL( LOW ) },
-  { LSTRKEY( "FLOAT" ), LNUMVAL( FLOAT ) },
+  { LSTRKEY( "INPUT" ),  LNUMVAL( INPUT ) },
+  { LSTRKEY( "HIGH" ),   LNUMVAL( HIGH ) },
+  { LSTRKEY( "LOW" ),    LNUMVAL( LOW ) },
+  { LSTRKEY( "FLOAT" ),  LNUMVAL( FLOAT ) },
   { LSTRKEY( "PULLUP" ), LNUMVAL( PULLUP ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_gpio( lua_State *L )
-{
+LUALIB_API int luaopen_gpio( lua_State *L ) {
 #ifdef GPIO_INTERRUPT_ENABLE
   int i;
   for(i=0;i<GPIO_PIN_NUM;i++){
@@ -249,5 +246,10 @@ LUALIB_API int luaopen_gpio( lua_State *L )
   }
   platform_gpio_init(gpio_intr_callback);
 #endif
+
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/hx711.c b/app/modules/hx711.c
index 37e59ad7..f0f4e5f7 100644
--- a/app/modules/hx711.c
+++ b/app/modules/hx711.c
@@ -3,7 +3,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 #include "c_stdlib.h"
 #include "c_string.h"
@@ -66,8 +65,8 @@ static int ICACHE_FLASH_ATTR hx711_read(lua_State* L) {
   return 1;
 }
 
-const LUA_REG_TYPE hx711_map[] =
-{
+// Module function map
+const LUA_REG_TYPE hx711_map[] = {
   { LSTRKEY( "init" ), LFUNCVAL( hx711_init )},
   { LSTRKEY( "read" ), LFUNCVAL( hx711_read )},
   { LNILKEY, LNILVAL}
@@ -75,5 +74,9 @@ const LUA_REG_TYPE hx711_map[] =
 
 LUALIB_API int luaopen_hx711(lua_State *L) {
   // TODO: Make sure that the GPIO system is initialized
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/i2c.c b/app/modules/i2c.c
index 0b241d2d..b52173b3 100644
--- a/app/modules/i2c.c
+++ b/app/modules/i2c.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 // Lua: speed = i2c.setup( id, sda, scl, speed )
@@ -141,23 +140,25 @@ static int i2c_read( lua_State *L )
 }
 
 // Module function map
-const LUA_REG_TYPE i2c_map[] = 
-{
-  { LSTRKEY( "setup" ),  LFUNCVAL( i2c_setup ) },
-  { LSTRKEY( "start" ), LFUNCVAL( i2c_start ) },
-  { LSTRKEY( "stop" ), LFUNCVAL( i2c_stop ) },
-  { LSTRKEY( "address" ), LFUNCVAL( i2c_address ) },
-  { LSTRKEY( "write" ), LFUNCVAL( i2c_write ) },
-  { LSTRKEY( "read" ), LFUNCVAL( i2c_read ) },
-  // { LSTRKEY( "FAST" ), LNUMVAL( PLATFORM_I2C_SPEED_FAST ) },
-  { LSTRKEY( "SLOW" ), LNUMVAL( PLATFORM_I2C_SPEED_SLOW ) },
+const LUA_REG_TYPE i2c_map[] = {
+  { LSTRKEY( "setup" ),       LFUNCVAL( i2c_setup ) },
+  { LSTRKEY( "start" ),       LFUNCVAL( i2c_start ) },
+  { LSTRKEY( "stop" ),        LFUNCVAL( i2c_stop ) },
+  { LSTRKEY( "address" ),     LFUNCVAL( i2c_address ) },
+  { LSTRKEY( "write" ),       LFUNCVAL( i2c_write ) },
+  { LSTRKEY( "read" ),        LFUNCVAL( i2c_read ) },
+ //{ LSTRKEY( "FAST" ),       LNUMVAL( PLATFORM_I2C_SPEED_FAST ) },
+  { LSTRKEY( "SLOW" ),        LNUMVAL( PLATFORM_I2C_SPEED_SLOW ) },
   { LSTRKEY( "TRANSMITTER" ), LNUMVAL( PLATFORM_I2C_DIRECTION_TRANSMITTER ) },
-  { LSTRKEY( "RECEIVER" ), LNUMVAL( PLATFORM_I2C_DIRECTION_RECEIVER ) },
+  { LSTRKEY( "RECEIVER" ),    LNUMVAL( PLATFORM_I2C_DIRECTION_RECEIVER ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_i2c( lua_State *L )
-{
+LUALIB_API int luaopen_i2c( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
 
diff --git a/app/modules/mqtt.c b/app/modules/mqtt.c
index 1cf595a9..7d396133 100644
--- a/app/modules/mqtt.c
+++ b/app/modules/mqtt.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #include "c_string.h"
@@ -1390,22 +1389,20 @@ static int mqtt_socket_lwt( lua_State* L )
 }
 
 // Module function map
-static const LUA_REG_TYPE mqtt_socket_map[] =
-{
-  { LSTRKEY( "connect" ), LFUNCVAL ( mqtt_socket_connect ) },
-  { LSTRKEY( "close" ), LFUNCVAL ( mqtt_socket_close ) },
-  { LSTRKEY( "publish" ), LFUNCVAL ( mqtt_socket_publish ) },
-  { LSTRKEY( "subscribe" ), LFUNCVAL ( mqtt_socket_subscribe ) },
-  { LSTRKEY( "lwt" ), LFUNCVAL ( mqtt_socket_lwt ) },
-  { LSTRKEY( "on" ), LFUNCVAL ( mqtt_socket_on ) },
-  { LSTRKEY( "__gc" ), LFUNCVAL ( mqtt_delete ) },
-  { LSTRKEY( "__index" ), LROVAL ( mqtt_socket_map ) },
+static const LUA_REG_TYPE mqtt_socket_map[] = {
+  { LSTRKEY( "connect" ),   LFUNCVAL( mqtt_socket_connect ) },
+  { LSTRKEY( "close" ),     LFUNCVAL( mqtt_socket_close ) },
+  { LSTRKEY( "publish" ),   LFUNCVAL( mqtt_socket_publish ) },
+  { LSTRKEY( "subscribe" ), LFUNCVAL( mqtt_socket_subscribe ) },
+  { LSTRKEY( "lwt" ),       LFUNCVAL( mqtt_socket_lwt ) },
+  { LSTRKEY( "on" ),        LFUNCVAL( mqtt_socket_on ) },
+  { LSTRKEY( "__gc" ),      LFUNCVAL( mqtt_delete ) },
+  { LSTRKEY( "__index" ),   LROVAL( mqtt_socket_map ) },
   { LNILKEY, LNILVAL }
 };
 
-const LUA_REG_TYPE mqtt_map[] =
-{
-  { LSTRKEY( "Client" ), LFUNCVAL ( mqtt_socket_client ) },
+const LUA_REG_TYPE mqtt_map[] = {
+  { LSTRKEY( "Client" ),      LFUNCVAL( mqtt_socket_client ) },
   { LSTRKEY( "__metatable" ), LROVAL( mqtt_map ) },
   { LNILKEY, LNILVAL }
 };
@@ -1413,5 +1410,9 @@ const LUA_REG_TYPE mqtt_map[] =
 LUALIB_API int luaopen_mqtt( lua_State *L )
 {
   luaL_rometatable(L, "mqtt.socket", (void *)mqtt_socket_map);  // create metatable for mqtt.socket
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/net.c b/app/modules/net.c
index 6aeed291..9555324e 100644
--- a/app/modules/net.c
+++ b/app/modules/net.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #include "c_string.h"
@@ -1506,66 +1505,59 @@ static int expose_array(lua_State* L, char *array, unsigned short len) {
 #endif
 
 // Module function map
-static const LUA_REG_TYPE net_server_map[] =
-{
-  { LSTRKEY( "listen" ), LFUNCVAL ( net_server_listen ) },
-  { LSTRKEY( "close" ), LFUNCVAL ( net_server_close ) },
-  { LSTRKEY( "on" ), LFUNCVAL ( net_udpserver_on ) },
-  { LSTRKEY( "send" ), LFUNCVAL ( net_udpserver_send ) },
-  // { LSTRKEY( "delete" ), LFUNCVAL ( net_server_delete ) },
-  { LSTRKEY( "__gc" ), LFUNCVAL ( net_server_delete ) },
-  { LSTRKEY( "__index" ), LROVAL ( net_server_map ) },
+static const LUA_REG_TYPE net_server_map[] = {
+  { LSTRKEY( "listen" ),  LFUNCVAL( net_server_listen ) },
+  { LSTRKEY( "close" ),   LFUNCVAL( net_server_close ) },
+  { LSTRKEY( "on" ),      LFUNCVAL( net_udpserver_on ) },
+  { LSTRKEY( "send" ),    LFUNCVAL( net_udpserver_send ) },
+//{ LSTRKEY( "delete" ),  LFUNCVAL( net_server_delete ) },
+  { LSTRKEY( "__gc" ),    LFUNCVAL( net_server_delete ) },
+  { LSTRKEY( "__index" ), LROVAL( net_server_map ) },
   { LNILKEY, LNILVAL }
 };
 
-static const LUA_REG_TYPE net_socket_map[] =
-{
+static const LUA_REG_TYPE net_socket_map[] = {
   { LSTRKEY( "connect" ), LFUNCVAL( net_socket_connect ) },
-  { LSTRKEY( "close" ), LFUNCVAL ( net_socket_close ) },
-  { LSTRKEY( "on" ), LFUNCVAL ( net_socket_on ) },
-  { LSTRKEY( "send" ), LFUNCVAL ( net_socket_send ) },
-  { LSTRKEY( "hold" ), LFUNCVAL ( net_socket_hold ) },
-  { LSTRKEY( "unhold" ), LFUNCVAL ( net_socket_unhold ) },
-  { LSTRKEY( "dns" ), LFUNCVAL ( net_socket_dns ) },
-  { LSTRKEY( "getpeer" ), LFUNCVAL ( net_socket_getpeer ) },
-  // { LSTRKEY( "delete" ), LFUNCVAL ( net_socket_delete ) },
-  { LSTRKEY( "__gc" ), LFUNCVAL ( net_socket_delete ) },
-  { LSTRKEY( "__index" ), LROVAL ( net_socket_map ) },
+  { LSTRKEY( "close" ),   LFUNCVAL( net_socket_close ) },
+  { LSTRKEY( "on" ),      LFUNCVAL( net_socket_on ) },
+  { LSTRKEY( "send" ),    LFUNCVAL( net_socket_send ) },
+  { LSTRKEY( "hold" ),    LFUNCVAL( net_socket_hold ) },
+  { LSTRKEY( "unhold" ),  LFUNCVAL( net_socket_unhold ) },
+  { LSTRKEY( "dns" ),     LFUNCVAL( net_socket_dns ) },
+  { LSTRKEY( "getpeer" ), LFUNCVAL( net_socket_getpeer ) },
+//{ LSTRKEY( "delete" ),  LFUNCVAL( net_socket_delete ) },
+  { LSTRKEY( "__gc" ),    LFUNCVAL( net_socket_delete ) },
+  { LSTRKEY( "__index" ), LROVAL( net_socket_map ) },
   { LNILKEY, LNILVAL }
 };
 #if 0
-static const LUA_REG_TYPE net_array_map[] =
-{
-  { LSTRKEY( "__index" ), LFUNCVAL( net_array_index ) },
+static const LUA_REG_TYPE net_array_map[] = {
+  { LSTRKEY( "__index" ),    LFUNCVAL( net_array_index ) },
   { LSTRKEY( "__newindex" ), LFUNCVAL( net_array_newindex ) },
   { LNILKEY, LNILVAL }
 };
 #endif
 
-static const LUA_REG_TYPE net_dns_map[] =
-{
-  { LSTRKEY( "setdnsserver" ), LFUNCVAL ( net_setdnsserver ) },  
-  { LSTRKEY( "getdnsserver" ), LFUNCVAL ( net_getdnsserver ) }, 
-  { LSTRKEY( "resolve" ), LFUNCVAL ( net_dns_static ) },  
+static const LUA_REG_TYPE net_dns_map[] = {
+  { LSTRKEY( "setdnsserver" ), LFUNCVAL( net_setdnsserver ) },  
+  { LSTRKEY( "getdnsserver" ), LFUNCVAL( net_getdnsserver ) }, 
+  { LSTRKEY( "resolve" ),      LFUNCVAL( net_dns_static ) },  
   { LNILKEY, LNILVAL }
 };
 
-const LUA_REG_TYPE net_map[] = 
-{
-  { LSTRKEY( "createServer" ), LFUNCVAL ( net_createServer ) },
-  { LSTRKEY( "createConnection" ), LFUNCVAL ( net_createConnection ) },
-  { LSTRKEY( "multicastJoin"), LFUNCVAL( net_multicastJoin ) },
-  { LSTRKEY( "multicastLeave"), LFUNCVAL( net_multicastLeave ) },
-  { LSTRKEY( "dns" ), LROVAL( net_dns_map ) },
-  { LSTRKEY( "TCP" ), LNUMVAL( TCP ) },
-  { LSTRKEY( "UDP" ), LNUMVAL( UDP ) },
-
-  { LSTRKEY( "__metatable" ), LROVAL( net_map ) },
+const LUA_REG_TYPE net_map[] = {
+  { LSTRKEY( "createServer" ),     LFUNCVAL( net_createServer ) },
+  { LSTRKEY( "createConnection" ), LFUNCVAL( net_createConnection ) },
+  { LSTRKEY( "multicastJoin"),     LFUNCVAL( net_multicastJoin ) },
+  { LSTRKEY( "multicastLeave"),    LFUNCVAL( net_multicastLeave ) },
+  { LSTRKEY( "dns" ),              LROVAL( net_dns_map ) },
+  { LSTRKEY( "TCP" ),              LNUMVAL( TCP ) },
+  { LSTRKEY( "UDP" ),              LNUMVAL( UDP ) },
+  { LSTRKEY( "__metatable" ),      LROVAL( net_map ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_net( lua_State *L )
-{
+LUALIB_API int luaopen_net( lua_State *L ) {
   int i;
   for(i=0;i<MAX_SOCKET;i++)
   {
@@ -1575,7 +1567,12 @@ LUALIB_API int luaopen_net( lua_State *L )
   luaL_rometatable(L, "net.server", (void *)net_server_map);  // create metatable for net.server
   luaL_rometatable(L, "net.socket", (void *)net_socket_map);  // create metatable for net.socket
   #if 0
-  luaL_rometatable(L, "net.array", (void *)net_array_map);  // create metatable for net.array
+  luaL_rometatable(L, "net.array", (void *)net_array_map);    // create metatable for net.array
   #endif
+
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/ow.c b/app/modules/ow.c
index be92bb6b..e2c4b27a 100644
--- a/app/modules/ow.c
+++ b/app/modules/ow.c
@@ -1,8 +1,8 @@
 // Module for interfacing with the OneWire interface
 
 #include "lauxlib.h"
-#include "auxmods.h"
 #include "lrodefs.h"
+#include "platform.h"
 #include "driver/onewire.h"
 
 // Lua: ow.setup( id )
@@ -280,33 +280,35 @@ static int ow_crc16( lua_State *L )
 #endif
 
 // Module function map
-const LUA_REG_TYPE ow_map[] = 
-{
-  { LSTRKEY( "setup" ),  LFUNCVAL( ow_setup ) },
-  { LSTRKEY( "reset" ), LFUNCVAL( ow_reset ) },
-  { LSTRKEY( "skip" ), LFUNCVAL( ow_skip ) },
-  { LSTRKEY( "select" ), LFUNCVAL( ow_select ) },
-  { LSTRKEY( "write" ), LFUNCVAL( ow_write ) },
-  { LSTRKEY( "write_bytes" ), LFUNCVAL( ow_write_bytes ) },
-  { LSTRKEY( "read" ), LFUNCVAL( ow_read ) },
-  { LSTRKEY( "read_bytes" ), LFUNCVAL( ow_read_bytes ) },
-  { LSTRKEY( "depower" ), LFUNCVAL( ow_depower ) },
+const LUA_REG_TYPE ow_map[] = {
+  { LSTRKEY( "setup" ),         LFUNCVAL( ow_setup ) },
+  { LSTRKEY( "reset" ),         LFUNCVAL( ow_reset ) },
+  { LSTRKEY( "skip" ),          LFUNCVAL( ow_skip ) },
+  { LSTRKEY( "select" ),        LFUNCVAL( ow_select ) },
+  { LSTRKEY( "write" ),         LFUNCVAL( ow_write ) },
+  { LSTRKEY( "write_bytes" ),   LFUNCVAL( ow_write_bytes ) },
+  { LSTRKEY( "read" ),          LFUNCVAL( ow_read ) },
+  { LSTRKEY( "read_bytes" ),    LFUNCVAL( ow_read_bytes ) },
+  { LSTRKEY( "depower" ),       LFUNCVAL( ow_depower ) },
 #if ONEWIRE_SEARCH
-  { LSTRKEY( "reset_search" ), LFUNCVAL( ow_reset_search ) },
+  { LSTRKEY( "reset_search" ),  LFUNCVAL( ow_reset_search ) },
   { LSTRKEY( "target_search" ), LFUNCVAL( ow_target_search ) },
-  { LSTRKEY( "search" ), LFUNCVAL( ow_search ) },
+  { LSTRKEY( "search" ),        LFUNCVAL( ow_search ) },
 #endif
 #if ONEWIRE_CRC
-  { LSTRKEY( "crc8" ), LFUNCVAL( ow_crc8 ) },
+  { LSTRKEY( "crc8" ),          LFUNCVAL( ow_crc8 ) },
 #if ONEWIRE_CRC16
-  { LSTRKEY( "check_crc16" ), LFUNCVAL( ow_check_crc16 ) },
-  { LSTRKEY( "crc16" ), LFUNCVAL( ow_crc16 ) },
+  { LSTRKEY( "check_crc16" ),   LFUNCVAL( ow_check_crc16 ) },
+  { LSTRKEY( "crc16" ),         LFUNCVAL( ow_crc16 ) },
 #endif
 #endif
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_ow( lua_State *L )
-{
+LUALIB_API int luaopen_ow( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/pwm.c b/app/modules/pwm.c
index b88a2dd8..8465e7c4 100644
--- a/app/modules/pwm.c
+++ b/app/modules/pwm.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #include "c_types.h"
@@ -123,20 +122,22 @@ static int lpwm_getduty( lua_State* L )
 }
 
 // Module function map
-const LUA_REG_TYPE pwm_map[] = 
-{
-  { LSTRKEY( "setup" ), LFUNCVAL( lpwm_setup ) },
-  { LSTRKEY( "close" ), LFUNCVAL( lpwm_close ) },
-  { LSTRKEY( "start" ), LFUNCVAL( lpwm_start ) },
-  { LSTRKEY( "stop" ), LFUNCVAL( lpwm_stop ) },
+const LUA_REG_TYPE pwm_map[] = {
+  { LSTRKEY( "setup" ),    LFUNCVAL( lpwm_setup ) },
+  { LSTRKEY( "close" ),    LFUNCVAL( lpwm_close ) },
+  { LSTRKEY( "start" ),    LFUNCVAL( lpwm_start ) },
+  { LSTRKEY( "stop" ),     LFUNCVAL( lpwm_stop ) },
   { LSTRKEY( "setclock" ), LFUNCVAL( lpwm_setclock ) },
   { LSTRKEY( "getclock" ), LFUNCVAL( lpwm_getclock ) },
-  { LSTRKEY( "setduty" ), LFUNCVAL( lpwm_setduty ) },
-  { LSTRKEY( "getduty" ), LFUNCVAL( lpwm_getduty ) },
+  { LSTRKEY( "setduty" ),  LFUNCVAL( lpwm_setduty ) },
+  { LSTRKEY( "getduty" ),  LFUNCVAL( lpwm_getduty ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_pwm( lua_State *L )
-{
+LUALIB_API int luaopen_pwm( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/rc.c b/app/modules/rc.c
index 24df4a10..9137bedf 100644
--- a/app/modules/rc.c
+++ b/app/modules/rc.c
@@ -79,8 +79,8 @@ static int ICACHE_FLASH_ATTR rc_send(lua_State* L) {
   return 1;
 }
 
-const LUA_REG_TYPE rc_map[] =
-{
+// Module function map
+const LUA_REG_TYPE rc_map[] = {
   { LSTRKEY( "send" ), LFUNCVAL( rc_send )},
   { LNILKEY, LNILVAL}
 };
@@ -88,5 +88,9 @@ const LUA_REG_TYPE rc_map[] =
 //LUALIB_API int luaopen_ultra(lua_State *L) {
 LUALIB_API int luaopen_rc(lua_State *L) {
   // TODO: Make sure that the GPIO system is initialized
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/rtcfifo.c b/app/modules/rtcfifo.c
index c347c635..16c5d39b 100644
--- a/app/modules/rtcfifo.c
+++ b/app/modules/rtcfifo.c
@@ -165,8 +165,7 @@ static int rtcfifo_dsleep_until_sample (lua_State *L)
 #endif
 
 // Module function map
-const LUA_REG_TYPE rtcfifo_map[] =
-{
+const LUA_REG_TYPE rtcfifo_map[] = {
   { LSTRKEY("prepare"),             LFUNCVAL(rtcfifo_prepare) },
   { LSTRKEY("ready"),               LFUNCVAL(rtcfifo_ready) },
   { LSTRKEY("put"),                 LFUNCVAL(rtcfifo_put) },
@@ -182,5 +181,9 @@ const LUA_REG_TYPE rtcfifo_map[] =
 
 LUALIB_API int luaopen_rtcfifo (lua_State *L)
 {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/rtcmem.c b/app/modules/rtcmem.c
index db03e515..7d1fcf8b 100644
--- a/app/modules/rtcmem.c
+++ b/app/modules/rtcmem.c
@@ -41,14 +41,16 @@ static int rtcmem_write32 (lua_State *L)
 
 
 // Module function map
-const LUA_REG_TYPE rtcmem_map[] =
-{
+const LUA_REG_TYPE rtcmem_map[] = {
   { LSTRKEY("read32"),  LFUNCVAL(rtcmem_read32)  },
   { LSTRKEY("write32"), LFUNCVAL(rtcmem_write32) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_rtcmem (lua_State *L)
-{
+LUALIB_API int luaopen_rtcmem (lua_State *L) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/rtctime.c b/app/modules/rtctime.c
index fdb223ac..39ba1517 100644
--- a/app/modules/rtctime.c
+++ b/app/modules/rtctime.c
@@ -116,16 +116,18 @@ static int rtctime_dsleep_aligned (lua_State *L)
 
 
 // Module function map
-const LUA_REG_TYPE rtctime_map[] =
-{
-  { LSTRKEY("set"), LFUNCVAL(rtctime_set) },
-  { LSTRKEY("get"), LFUNCVAL(rtctime_get) },
-  { LSTRKEY("dsleep"),  LFUNCVAL(rtctime_dsleep)  },
+const LUA_REG_TYPE rtctime_map[] = {
+  { LSTRKEY("set"),            LFUNCVAL(rtctime_set) },
+  { LSTRKEY("get"),            LFUNCVAL(rtctime_get) },
+  { LSTRKEY("dsleep"),         LFUNCVAL(rtctime_dsleep)  },
   { LSTRKEY("dsleep_aligned"), LFUNCVAL(rtctime_dsleep_aligned) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_rtctime (lua_State *L)
-{
+LUALIB_API int luaopen_rtctime (lua_State *L) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/sntp.c b/app/modules/sntp.c
index 3ae5e1a9..b3290706 100644
--- a/app/modules/sntp.c
+++ b/app/modules/sntp.c
@@ -376,13 +376,15 @@ error:
 
 
 // Module function map
-const LUA_REG_TYPE sntp_map[] =
-{
+const LUA_REG_TYPE sntp_map[] = {
   { LSTRKEY("sync"),  LFUNCVAL(sntp_sync)  },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_sntp (lua_State *L)
-{
+LUALIB_API int luaopen_sntp (lua_State *L) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/spi.c b/app/modules/spi.c
index 40e9ee53..227c5936 100644
--- a/app/modules/spi.c
+++ b/app/modules/spi.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #define SPI_HALFDUPLEX 0
@@ -307,27 +306,29 @@ static int spi_transaction( lua_State *L )
 
 
 // Module function map
-const LUA_REG_TYPE spi_map[] = 
-{
+const LUA_REG_TYPE spi_map[] = {
   { LSTRKEY( "setup" ),       LFUNCVAL( spi_setup ) },
   { LSTRKEY( "send" ),        LFUNCVAL( spi_send_recv ) },
   { LSTRKEY( "recv" ),        LFUNCVAL( spi_recv ) },
   { LSTRKEY( "set_mosi" ),    LFUNCVAL( spi_set_mosi ) },
   { LSTRKEY( "get_miso" ),    LFUNCVAL( spi_get_miso ) },
   { LSTRKEY( "transaction" ), LFUNCVAL( spi_transaction ) },
-  { LSTRKEY( "MASTER" ),    LNUMVAL( PLATFORM_SPI_MASTER ) },
-  { LSTRKEY( "SLAVE" ),     LNUMVAL( PLATFORM_SPI_SLAVE) },
-  { LSTRKEY( "CPHA_LOW" ),  LNUMVAL( PLATFORM_SPI_CPHA_LOW) },
-  { LSTRKEY( "CPHA_HIGH" ), LNUMVAL( PLATFORM_SPI_CPHA_HIGH) },
-  { LSTRKEY( "CPOL_LOW" ),  LNUMVAL( PLATFORM_SPI_CPOL_LOW) },
-  { LSTRKEY( "CPOL_HIGH" ), LNUMVAL( PLATFORM_SPI_CPOL_HIGH) },
-  { LSTRKEY( "DATABITS_8" ), LNUMVAL( 8 ) },
-  { LSTRKEY( "HALFDUPLEX" ), LNUMVAL( SPI_HALFDUPLEX ) },
-  { LSTRKEY( "FULLDUPLEX" ), LNUMVAL( SPI_FULLDUPLEX ) },
+  { LSTRKEY( "MASTER" ),      LNUMVAL( PLATFORM_SPI_MASTER ) },
+  { LSTRKEY( "SLAVE" ),       LNUMVAL( PLATFORM_SPI_SLAVE) },
+  { LSTRKEY( "CPHA_LOW" ),    LNUMVAL( PLATFORM_SPI_CPHA_LOW) },
+  { LSTRKEY( "CPHA_HIGH" ),   LNUMVAL( PLATFORM_SPI_CPHA_HIGH) },
+  { LSTRKEY( "CPOL_LOW" ),    LNUMVAL( PLATFORM_SPI_CPOL_LOW) },
+  { LSTRKEY( "CPOL_HIGH" ),   LNUMVAL( PLATFORM_SPI_CPOL_HIGH) },
+  { LSTRKEY( "DATABITS_8" ),  LNUMVAL( 8 ) },
+  { LSTRKEY( "HALFDUPLEX" ),  LNUMVAL( SPI_HALFDUPLEX ) },
+  { LSTRKEY( "FULLDUPLEX" ),  LNUMVAL( SPI_FULLDUPLEX ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_spi( lua_State *L )
-{
+LUALIB_API int luaopen_spi( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/tmr.c b/app/modules/tmr.c
index c49d5169..e020dd5b 100755
--- a/app/modules/tmr.c
+++ b/app/modules/tmr.c
@@ -50,7 +50,6 @@ tmr.softwd(int)
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 #include "c_types.h"
 
@@ -308,21 +307,21 @@ static int tmr_softwd( lua_State* L ){
 // Module function map
 
 const LUA_REG_TYPE tmr_map[] = {
-	{ LSTRKEY( "delay" ), LFUNCVAL( tmr_delay ) },
-	{ LSTRKEY( "now" ), LFUNCVAL( tmr_now ) },
-	{ LSTRKEY( "wdclr" ), LFUNCVAL( tmr_wdclr ) },
-	{ LSTRKEY( "softwd" ), LFUNCVAL( tmr_softwd ) },
-	{ LSTRKEY( "time" ), LFUNCVAL( tmr_time ) },
-	{ LSTRKEY( "register" ), LFUNCVAL ( tmr_register ) },
-	{ LSTRKEY( "alarm" ), LFUNCVAL( tmr_alarm ) },
-	{ LSTRKEY( "start" ), LFUNCVAL ( tmr_start ) },
-	{ LSTRKEY( "stop" ), LFUNCVAL ( tmr_stop ) },
-	{ LSTRKEY( "unregister" ), LFUNCVAL ( tmr_unregister ) },
-	{ LSTRKEY( "state" ), LFUNCVAL ( tmr_state ) },
-	{ LSTRKEY( "interval" ), LFUNCVAL ( tmr_interval) }, 
+	{ LSTRKEY( "delay" ),        LFUNCVAL( tmr_delay ) },
+	{ LSTRKEY( "now" ),          LFUNCVAL( tmr_now ) },
+	{ LSTRKEY( "wdclr" ),        LFUNCVAL( tmr_wdclr ) },
+	{ LSTRKEY( "softwd" ),       LFUNCVAL( tmr_softwd ) },
+	{ LSTRKEY( "time" ),         LFUNCVAL( tmr_time ) },
+	{ LSTRKEY( "register" ),     LFUNCVAL( tmr_register ) },
+	{ LSTRKEY( "alarm" ),        LFUNCVAL( tmr_alarm ) },
+	{ LSTRKEY( "start" ),        LFUNCVAL( tmr_start ) },
+	{ LSTRKEY( "stop" ),         LFUNCVAL( tmr_stop ) },
+	{ LSTRKEY( "unregister" ),   LFUNCVAL( tmr_unregister ) },
+	{ LSTRKEY( "state" ),        LFUNCVAL( tmr_state ) },
+	{ LSTRKEY( "interval" ),     LFUNCVAL( tmr_interval) }, 
 	{ LSTRKEY( "ALARM_SINGLE" ), LNUMVAL( TIMER_MODE_SINGLE ) },
-	{ LSTRKEY( "ALARM_SEMI" ), LNUMVAL( TIMER_MODE_SEMI ) },
-	{ LSTRKEY( "ALARM_AUTO" ), LNUMVAL( TIMER_MODE_AUTO ) },
+	{ LSTRKEY( "ALARM_SEMI" ),   LNUMVAL( TIMER_MODE_SEMI ) },
+	{ LSTRKEY( "ALARM_AUTO" ),   LNUMVAL( TIMER_MODE_AUTO ) },
 	{ LNILKEY, LNILVAL }
 };
 
@@ -338,6 +337,9 @@ LUALIB_API int luaopen_tmr( lua_State *L ){
 	ets_timer_setfn(&rtc_timer, rtc_callback, NULL);
 	ets_timer_arm_new(&rtc_timer, 1000, 1, 1);
 
-	return 0;
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
+  return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
-
diff --git a/app/modules/tsl2561.c b/app/modules/tsl2561.c
index 6c8fd96c..7d8589fe 100644
--- a/app/modules/tsl2561.c
+++ b/app/modules/tsl2561.c
@@ -100,35 +100,34 @@ static int ICACHE_FLASH_ATTR tsl2561_lua_getchannels(lua_State* L) {
 	return 3;
 }
 
-const LUA_REG_TYPE tsl2561_map[] =
-{
-	{	LSTRKEY( "settiming" ), LFUNCVAL( tsl2561_lua_settiming)},
-	{	LSTRKEY( "getlux" ), LFUNCVAL( tsl2561_lua_calclux )},
-	{	LSTRKEY( "getrawchannels" ), LFUNCVAL( tsl2561_lua_getchannels )},
-	{	LSTRKEY( "init" ), LFUNCVAL( tsl2561_init )},
-
-	{	LSTRKEY( "TSL2561_OK" ), LNUMVAL( TSL2561_ERROR_OK )},
+// Module function map
+const LUA_REG_TYPE tsl2561_map[] = {
+	{	LSTRKEY( "settiming" ),             LFUNCVAL( tsl2561_lua_settiming)},
+	{	LSTRKEY( "getlux" ),                LFUNCVAL( tsl2561_lua_calclux )},
+	{	LSTRKEY( "getrawchannels" ),        LFUNCVAL( tsl2561_lua_getchannels )},
+	{	LSTRKEY( "init" ),                  LFUNCVAL( tsl2561_init )},
+	{	LSTRKEY( "TSL2561_OK" ),            LNUMVAL( TSL2561_ERROR_OK )},
 	{	LSTRKEY( "TSL2561_ERROR_I2CINIT" ), LNUMVAL( TSL2561_ERROR_I2CINIT )},
 	{	LSTRKEY( "TSL2561_ERROR_I2CBUSY" ), LNUMVAL( TSL2561_ERROR_I2CBUSY )},
-	{	LSTRKEY( "TSL2561_ERROR_NOINIT" ), LNUMVAL( TSL2561_ERROR_NOINIT )},
-	{	LSTRKEY( "TSL2561_ERROR_LAST" ), LNUMVAL( TSL2561_ERROR_LAST )},
-
-	{	LSTRKEY( "INTEGRATIONTIME_13MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_13MS )},
+	{	LSTRKEY( "TSL2561_ERROR_NOINIT" ),  LNUMVAL( TSL2561_ERROR_NOINIT )},
+	{	LSTRKEY( "TSL2561_ERROR_LAST" ),    LNUMVAL( TSL2561_ERROR_LAST )},
+	{	LSTRKEY( "INTEGRATIONTIME_13MS" ),  LNUMVAL( TSL2561_INTEGRATIONTIME_13MS )},
 	{	LSTRKEY( "INTEGRATIONTIME_101MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_101MS )},
 	{	LSTRKEY( "INTEGRATIONTIME_402MS" ), LNUMVAL( TSL2561_INTEGRATIONTIME_402MS )},
-	{	LSTRKEY( "GAIN_1X" ), LNUMVAL( TSL2561_GAIN_1X )},
-	{	LSTRKEY( "GAIN_16X" ), LNUMVAL( TSL2561_GAIN_16X )},
-
-	{	LSTRKEY( "PACKAGE_CS" ), LNUMVAL( TSL2561_PACKAGE_CS )},
-	{	LSTRKEY( "PACKAGE_T_FN_CL" ), LNUMVAL( TSL2561_PACKAGE_T_FN_CL )},
-
-	{	LSTRKEY( "ADDRESS_GND" ), LNUMVAL( TSL2561_ADDRESS_GND )},
-	{	LSTRKEY( "ADDRESS_FLOAT" ), LNUMVAL( TSL2561_ADDRESS_FLOAT )},
-	{	LSTRKEY( "ADDRESS_VDD" ), LNUMVAL( TSL2561_ADDRESS_VDD )},
-
+	{	LSTRKEY( "GAIN_1X" ),               LNUMVAL( TSL2561_GAIN_1X )},
+	{	LSTRKEY( "GAIN_16X" ),              LNUMVAL( TSL2561_GAIN_16X )},
+	{	LSTRKEY( "PACKAGE_CS" ),            LNUMVAL( TSL2561_PACKAGE_CS )},
+	{	LSTRKEY( "PACKAGE_T_FN_CL" ),       LNUMVAL( TSL2561_PACKAGE_T_FN_CL )},
+	{	LSTRKEY( "ADDRESS_GND" ),           LNUMVAL( TSL2561_ADDRESS_GND )},
+	{	LSTRKEY( "ADDRESS_FLOAT" ),         LNUMVAL( TSL2561_ADDRESS_FLOAT )},
+	{	LSTRKEY( "ADDRESS_VDD" ),           LNUMVAL( TSL2561_ADDRESS_VDD )},
 	{	LNILKEY, LNILVAL}
 };
 
 LUALIB_API int luaopen_tsl2561(lua_State *L) {
-	return 0;
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
+  return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/u8g.c b/app/modules/u8g.c
index 32102f51..957494fa 100644
--- a/app/modules/u8g.c
+++ b/app/modules/u8g.c
@@ -1025,92 +1025,92 @@ U8G_DISPLAY_TABLE_SPI
 
 
 // Module function map
-static const LUA_REG_TYPE lu8g_display_map[] =
-{
-    { LSTRKEY( "begin" ),  LFUNCVAL( lu8g_begin ) },
-    { LSTRKEY( "drawBitmap" ),  LFUNCVAL( lu8g_drawBitmap ) },
-    { LSTRKEY( "drawBox" ),  LFUNCVAL( lu8g_drawBox ) },
-    { LSTRKEY( "drawCircle" ),  LFUNCVAL( lu8g_drawCircle ) },
-    { LSTRKEY( "drawDisc" ),  LFUNCVAL( lu8g_drawDisc ) },
-    { LSTRKEY( "drawEllipse" ),  LFUNCVAL( lu8g_drawEllipse ) },
-    { LSTRKEY( "drawFilledEllipse" ),  LFUNCVAL( lu8g_drawFilledEllipse ) },
-    { LSTRKEY( "drawFrame" ),  LFUNCVAL( lu8g_drawFrame ) },
-    { LSTRKEY( "drawHLine" ),  LFUNCVAL( lu8g_drawHLine ) },
-    { LSTRKEY( "drawLine" ),  LFUNCVAL( lu8g_drawLine ) },
-    { LSTRKEY( "drawPixel" ),  LFUNCVAL( lu8g_drawPixel ) },
-    { LSTRKEY( "drawRBox" ),  LFUNCVAL( lu8g_drawRBox ) },
-    { LSTRKEY( "drawRFrame" ),  LFUNCVAL( lu8g_drawRFrame ) },
-    { LSTRKEY( "drawStr" ),  LFUNCVAL( lu8g_drawStr ) },
-    { LSTRKEY( "drawStr90" ),  LFUNCVAL( lu8g_drawStr90 ) },
-    { LSTRKEY( "drawStr180" ),  LFUNCVAL( lu8g_drawStr180 ) },
-    { LSTRKEY( "drawStr270" ),  LFUNCVAL( lu8g_drawStr270 ) },
-    { LSTRKEY( "drawTriangle" ),  LFUNCVAL( lu8g_drawTriangle ) },
-    { LSTRKEY( "drawVLine" ),  LFUNCVAL( lu8g_drawVLine ) },
-    { LSTRKEY( "drawXBM" ),  LFUNCVAL( lu8g_drawXBM ) },
-    { LSTRKEY( "firstPage" ),  LFUNCVAL( lu8g_firstPage ) },
-    { LSTRKEY( "getColorIndex" ),  LFUNCVAL( lu8g_getColorIndex ) },
-    { LSTRKEY( "getFontAscent" ),  LFUNCVAL( lu8g_getFontAscent ) },
-    { LSTRKEY( "getFontDescent" ),  LFUNCVAL( lu8g_getFontDescent ) },
-    { LSTRKEY( "getFontLineSpacing" ),  LFUNCVAL( lu8g_getFontLineSpacing ) },
-    { LSTRKEY( "getHeight" ),  LFUNCVAL( lu8g_getHeight ) },
-    { LSTRKEY( "getMode" ),  LFUNCVAL( lu8g_getMode ) },
-    { LSTRKEY( "getStrWidth" ), LFUNCVAL( lu8g_getStrWidth ) },
-    { LSTRKEY( "getWidth" ),  LFUNCVAL( lu8g_getWidth ) },
-    { LSTRKEY( "nextPage" ),  LFUNCVAL( lu8g_nextPage ) },
-    { LSTRKEY( "setColorIndex" ),  LFUNCVAL( lu8g_setColorIndex ) },
-    { LSTRKEY( "setDefaultBackgroundColor" ),  LFUNCVAL( lu8g_setDefaultBackgroundColor ) },
-    { LSTRKEY( "setDefaultForegroundColor" ),  LFUNCVAL( lu8g_setDefaultForegroundColor ) },
-    { LSTRKEY( "setFont" ),  LFUNCVAL( lu8g_setFont ) },
-    { LSTRKEY( "setFontLineSpacingFactor" ),  LFUNCVAL( lu8g_setFontLineSpacingFactor ) },
-    { LSTRKEY( "setFontPosBaseline" ),  LFUNCVAL( lu8g_setFontPosBaseline ) },
-    { LSTRKEY( "setFontPosBottom" ),  LFUNCVAL( lu8g_setFontPosBottom ) },
-    { LSTRKEY( "setFontPosCenter" ),  LFUNCVAL( lu8g_setFontPosCenter ) },
-    { LSTRKEY( "setFontPosTop" ),  LFUNCVAL( lu8g_setFontPosTop ) },
-    { LSTRKEY( "setFontRefHeightAll" ),  LFUNCVAL( lu8g_setFontRefHeightAll ) },
-    { LSTRKEY( "setFontRefHeightExtendedText" ),  LFUNCVAL( lu8g_setFontRefHeightExtendedText ) },
-    { LSTRKEY( "setFontRefHeightText" ),  LFUNCVAL( lu8g_setFontRefHeightText ) },
-    { LSTRKEY( "setRot90" ),  LFUNCVAL( lu8g_setRot90 ) },
-    { LSTRKEY( "setRot180" ),  LFUNCVAL( lu8g_setRot180 ) },
-    { LSTRKEY( "setRot270" ),  LFUNCVAL( lu8g_setRot270 ) },
-    { LSTRKEY( "setScale2x2" ),  LFUNCVAL( lu8g_setScale2x2 ) },
-    { LSTRKEY( "sleepOff" ),  LFUNCVAL( lu8g_sleepOff ) },
-    { LSTRKEY( "sleepOn" ),  LFUNCVAL( lu8g_sleepOn ) },
-    { LSTRKEY( "undoRotation" ),  LFUNCVAL( lu8g_undoRotation ) },
-    { LSTRKEY( "undoScale" ),  LFUNCVAL( lu8g_undoScale ) },
-    { LSTRKEY( "__gc" ),  LFUNCVAL( lu8g_close_display ) },
-    { LSTRKEY( "__index" ), LROVAL ( lu8g_display_map ) },
-    { LNILKEY, LNILVAL }
+static const LUA_REG_TYPE lu8g_display_map[] = {
+  { LSTRKEY( "begin" ),                        LFUNCVAL( lu8g_begin ) },
+  { LSTRKEY( "drawBitmap" ),                   LFUNCVAL( lu8g_drawBitmap ) },
+  { LSTRKEY( "drawBox" ),                      LFUNCVAL( lu8g_drawBox ) },
+  { LSTRKEY( "drawCircle" ),                   LFUNCVAL( lu8g_drawCircle ) },
+  { LSTRKEY( "drawDisc" ),                     LFUNCVAL( lu8g_drawDisc ) },
+  { LSTRKEY( "drawEllipse" ),                  LFUNCVAL( lu8g_drawEllipse ) },
+  { LSTRKEY( "drawFilledEllipse" ),            LFUNCVAL( lu8g_drawFilledEllipse ) },
+  { LSTRKEY( "drawFrame" ),                    LFUNCVAL( lu8g_drawFrame ) },
+  { LSTRKEY( "drawHLine" ),                    LFUNCVAL( lu8g_drawHLine ) },
+  { LSTRKEY( "drawLine" ),                     LFUNCVAL( lu8g_drawLine ) },
+  { LSTRKEY( "drawPixel" ),                    LFUNCVAL( lu8g_drawPixel ) },
+  { LSTRKEY( "drawRBox" ),                     LFUNCVAL( lu8g_drawRBox ) },
+  { LSTRKEY( "drawRFrame" ),                   LFUNCVAL( lu8g_drawRFrame ) },
+  { LSTRKEY( "drawStr" ),                      LFUNCVAL( lu8g_drawStr ) },
+  { LSTRKEY( "drawStr90" ),                    LFUNCVAL( lu8g_drawStr90 ) },
+  { LSTRKEY( "drawStr180" ),                   LFUNCVAL( lu8g_drawStr180 ) },
+  { LSTRKEY( "drawStr270" ),                   LFUNCVAL( lu8g_drawStr270 ) },
+  { LSTRKEY( "drawTriangle" ),                 LFUNCVAL( lu8g_drawTriangle ) },
+  { LSTRKEY( "drawVLine" ),                    LFUNCVAL( lu8g_drawVLine ) },
+  { LSTRKEY( "drawXBM" ),                      LFUNCVAL( lu8g_drawXBM ) },
+  { LSTRKEY( "firstPage" ),                    LFUNCVAL( lu8g_firstPage ) },
+  { LSTRKEY( "getColorIndex" ),                LFUNCVAL( lu8g_getColorIndex ) },
+  { LSTRKEY( "getFontAscent" ),                LFUNCVAL( lu8g_getFontAscent ) },
+  { LSTRKEY( "getFontDescent" ),               LFUNCVAL( lu8g_getFontDescent ) },
+  { LSTRKEY( "getFontLineSpacing" ),           LFUNCVAL( lu8g_getFontLineSpacing ) },
+  { LSTRKEY( "getHeight" ),                    LFUNCVAL( lu8g_getHeight ) },
+  { LSTRKEY( "getMode" ),                      LFUNCVAL( lu8g_getMode ) },
+  { LSTRKEY( "getStrWidth" ),                  LFUNCVAL( lu8g_getStrWidth ) },
+  { LSTRKEY( "getWidth" ),                     LFUNCVAL( lu8g_getWidth ) },
+  { LSTRKEY( "nextPage" ),                     LFUNCVAL( lu8g_nextPage ) },
+  { LSTRKEY( "setColorIndex" ),                LFUNCVAL( lu8g_setColorIndex ) },
+  { LSTRKEY( "setDefaultBackgroundColor" ),    LFUNCVAL( lu8g_setDefaultBackgroundColor ) },
+  { LSTRKEY( "setDefaultForegroundColor" ),    LFUNCVAL( lu8g_setDefaultForegroundColor ) },
+  { LSTRKEY( "setFont" ),                      LFUNCVAL( lu8g_setFont ) },
+  { LSTRKEY( "setFontLineSpacingFactor" ),     LFUNCVAL( lu8g_setFontLineSpacingFactor ) },
+  { LSTRKEY( "setFontPosBaseline" ),           LFUNCVAL( lu8g_setFontPosBaseline ) },
+  { LSTRKEY( "setFontPosBottom" ),             LFUNCVAL( lu8g_setFontPosBottom ) },
+  { LSTRKEY( "setFontPosCenter" ),             LFUNCVAL( lu8g_setFontPosCenter ) },
+  { LSTRKEY( "setFontPosTop" ),                LFUNCVAL( lu8g_setFontPosTop ) },
+  { LSTRKEY( "setFontRefHeightAll" ),          LFUNCVAL( lu8g_setFontRefHeightAll ) },
+  { LSTRKEY( "setFontRefHeightExtendedText" ), LFUNCVAL( lu8g_setFontRefHeightExtendedText ) },
+  { LSTRKEY( "setFontRefHeightText" ),         LFUNCVAL( lu8g_setFontRefHeightText ) },
+  { LSTRKEY( "setRot90" ),                     LFUNCVAL( lu8g_setRot90 ) },
+  { LSTRKEY( "setRot180" ),                    LFUNCVAL( lu8g_setRot180 ) },
+  { LSTRKEY( "setRot270" ),                    LFUNCVAL( lu8g_setRot270 ) },
+  { LSTRKEY( "setScale2x2" ),                  LFUNCVAL( lu8g_setScale2x2 ) },
+  { LSTRKEY( "sleepOff" ),                     LFUNCVAL( lu8g_sleepOff ) },
+  { LSTRKEY( "sleepOn" ),                      LFUNCVAL( lu8g_sleepOn ) },
+  { LSTRKEY( "undoRotation" ),                 LFUNCVAL( lu8g_undoRotation ) },
+  { LSTRKEY( "undoScale" ),                    LFUNCVAL( lu8g_undoScale ) },
+  { LSTRKEY( "__gc" ),                         LFUNCVAL( lu8g_close_display ) },
+  { LSTRKEY( "__index" ),                      LROVAL( lu8g_display_map ) },
+  { LNILKEY, LNILVAL }
 };
 
-const LUA_REG_TYPE lu8g_map[] = 
-{
 #undef U8G_DISPLAY_TABLE_ENTRY
-#define U8G_DISPLAY_TABLE_ENTRY(device) { LSTRKEY( #device ), LFUNCVAL ( lu8g_ ##device ) },
-    U8G_DISPLAY_TABLE_I2C
-    U8G_DISPLAY_TABLE_SPI
-
-    // Register fonts
 #undef U8G_FONT_TABLE_ENTRY
-#define U8G_FONT_TABLE_ENTRY(font) { LSTRKEY( #font ), LUDATA( (void *)(u8g_ ## font) ) },
-    U8G_FONT_TABLE
 
-    // Options for circle/ ellipse drawing
-    { LSTRKEY( "DRAW_UPPER_RIGHT" ), LNUMVAL( U8G_DRAW_UPPER_RIGHT ) },
-    { LSTRKEY( "DRAW_UPPER_LEFT" ),  LNUMVAL( U8G_DRAW_UPPER_LEFT ) },
-    { LSTRKEY( "DRAW_LOWER_RIGHT" ), LNUMVAL( U8G_DRAW_LOWER_RIGHT ) },
-    { LSTRKEY( "DRAW_LOWER_LEFT" ),  LNUMVAL( U8G_DRAW_LOWER_LEFT ) },
-    { LSTRKEY( "DRAW_ALL" ),         LNUMVAL( U8G_DRAW_ALL ) },
-
-    // Display modes
-    { LSTRKEY( "MODE_BW" ),       LNUMVAL( U8G_MODE_BW ) },
-    { LSTRKEY( "MODE_GRAY2BIT" ), LNUMVAL( U8G_MODE_GRAY2BIT ) },
-
-    { LSTRKEY( "__metatable" ), LROVAL( lu8g_map ) },
-    { LNILKEY, LNILVAL }
+const LUA_REG_TYPE lu8g_map[] = {
+#define U8G_DISPLAY_TABLE_ENTRY(device) \
+  { LSTRKEY( #device ),            LFUNCVAL ( lu8g_ ##device ) },
+  U8G_DISPLAY_TABLE_I2C
+  U8G_DISPLAY_TABLE_SPI
+// Register fonts
+#define U8G_FONT_TABLE_ENTRY(font) \
+  { LSTRKEY( #font ),              LUDATA( (void *)(u8g_ ## font) ) },
+  U8G_FONT_TABLE
+  // Options for circle/ ellipse drawing
+  { LSTRKEY( "DRAW_UPPER_RIGHT" ), LNUMVAL( U8G_DRAW_UPPER_RIGHT ) },
+  { LSTRKEY( "DRAW_UPPER_LEFT" ),  LNUMVAL( U8G_DRAW_UPPER_LEFT ) },
+  { LSTRKEY( "DRAW_LOWER_RIGHT" ), LNUMVAL( U8G_DRAW_LOWER_RIGHT ) },
+  { LSTRKEY( "DRAW_LOWER_LEFT" ),  LNUMVAL( U8G_DRAW_LOWER_LEFT ) },
+  { LSTRKEY( "DRAW_ALL" ),         LNUMVAL( U8G_DRAW_ALL ) },
+  // Display modes
+  { LSTRKEY( "MODE_BW" ),          LNUMVAL( U8G_MODE_BW ) },
+  { LSTRKEY( "MODE_GRAY2BIT" ),    LNUMVAL( U8G_MODE_GRAY2BIT ) },
+  { LSTRKEY( "__metatable" ), LROVAL( lu8g_map ) },
+  { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_u8g( lua_State *L )
-{
-    luaL_rometatable(L, "u8g.display", (void *)lu8g_display_map);  // create metatable
-    return 0;
+LUALIB_API int luaopen_u8g( lua_State *L ) {
+  luaL_rometatable(L, "u8g.display", (void *)lu8g_display_map);  // create metatable
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
+  return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/uart.c b/app/modules/uart.c
index d5d81bd7..81a7ccc7 100755
--- a/app/modules/uart.c
+++ b/app/modules/uart.c
@@ -2,7 +2,6 @@
 
 #include "lauxlib.h"
 #include "platform.h"
-#include "auxmods.h"
 #include "lrodefs.h"
 
 #include "c_types.h"
@@ -156,16 +155,18 @@ static int uart_write( lua_State* L )
 }
 
 // Module function map
-const LUA_REG_TYPE uart_map[] = 
-{
+const LUA_REG_TYPE uart_map[] =  {
   { LSTRKEY( "setup" ),  LFUNCVAL( uart_setup ) },
-  { LSTRKEY( "write" ), LFUNCVAL( uart_write ) },
-  { LSTRKEY( "on" ), LFUNCVAL( uart_on ) },
-  { LSTRKEY( "alt" ), LFUNCVAL( uart_alt ) },
+  { LSTRKEY( "write" ),  LFUNCVAL( uart_write ) },
+  { LSTRKEY( "on" ),     LFUNCVAL( uart_on ) },
+  { LSTRKEY( "alt" ),    LFUNCVAL( uart_alt ) },
   { LNILKEY, LNILVAL }
 };
 
-LUALIB_API int luaopen_uart( lua_State *L )
-{
+LUALIB_API int luaopen_uart( lua_State *L ) {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/modules/wifi.c b/app/modules/wifi.c
index 2b076b8f..3aa6695c 100644
--- a/app/modules/wifi.c
+++ b/app/modules/wifi.c
@@ -1337,96 +1337,95 @@ static int wifi_ap_dhcp_stop( lua_State* L )
 }
 
 // Module function map
-static const LUA_REG_TYPE wifi_station_map[] =
-{
-  { LSTRKEY( "getconfig" ), LFUNCVAL ( wifi_station_getconfig ) },
-  { LSTRKEY( "config" ), LFUNCVAL ( wifi_station_config ) },
-  { LSTRKEY( "connect" ), LFUNCVAL ( wifi_station_connect4lua ) },
-  { LSTRKEY( "disconnect" ), LFUNCVAL ( wifi_station_disconnect4lua ) },
-  { LSTRKEY( "autoconnect" ), LFUNCVAL ( wifi_station_setauto ) },
-  { LSTRKEY( "getip" ), LFUNCVAL ( wifi_station_getip ) },
-  { LSTRKEY( "setip" ), LFUNCVAL ( wifi_station_setip ) },
-  { LSTRKEY( "getbroadcast" ), LFUNCVAL ( wifi_station_getbroadcast) },
-  { LSTRKEY( "getmac" ), LFUNCVAL ( wifi_station_getmac ) },
-  { LSTRKEY( "setmac" ), LFUNCVAL ( wifi_station_setmac ) },
-  { LSTRKEY( "getap" ), LFUNCVAL ( wifi_station_listap ) },
-  { LSTRKEY( "status" ), LFUNCVAL ( wifi_station_status ) },
-  { LSTRKEY( "eventMonReg" ), LFUNCVAL ( wifi_station_event_mon_reg ) },
-  { LSTRKEY( "eventMonStart" ), LFUNCVAL ( wifi_station_event_mon_start ) },
-  { LSTRKEY( "eventMonStop" ), LFUNCVAL ( wifi_station_event_mon_stop ) },
+static const LUA_REG_TYPE wifi_station_map[] = {
+  { LSTRKEY( "getconfig" ),     LFUNCVAL( wifi_station_getconfig ) },
+  { LSTRKEY( "config" ),        LFUNCVAL( wifi_station_config ) },
+  { LSTRKEY( "connect" ),       LFUNCVAL( wifi_station_connect4lua ) },
+  { LSTRKEY( "disconnect" ),    LFUNCVAL( wifi_station_disconnect4lua ) },
+  { LSTRKEY( "autoconnect" ),   LFUNCVAL( wifi_station_setauto ) },
+  { LSTRKEY( "getip" ),         LFUNCVAL( wifi_station_getip ) },
+  { LSTRKEY( "setip" ),         LFUNCVAL( wifi_station_setip ) },
+  { LSTRKEY( "getbroadcast" ),  LFUNCVAL( wifi_station_getbroadcast) },
+  { LSTRKEY( "getmac" ),        LFUNCVAL( wifi_station_getmac ) },
+  { LSTRKEY( "setmac" ),        LFUNCVAL( wifi_station_setmac ) },
+  { LSTRKEY( "getap" ),         LFUNCVAL( wifi_station_listap ) },
+  { LSTRKEY( "status" ),        LFUNCVAL( wifi_station_status ) },
+  { LSTRKEY( "eventMonReg" ),   LFUNCVAL( wifi_station_event_mon_reg ) },
+  { LSTRKEY( "eventMonStart" ), LFUNCVAL( wifi_station_event_mon_start ) },
+  { LSTRKEY( "eventMonStop" ),  LFUNCVAL( wifi_station_event_mon_stop ) },
   { 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 ) },
+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( "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 ) },
-  { LSTRKEY( "dhcp" ), LROVAL( wifi_ap_dhcp_map ) },
-
-//  { LSTRKEY( "__metatable" ), LROVAL( wifi_ap_map ) },
+static const LUA_REG_TYPE wifi_ap_map[] = {
+  { LSTRKEY( "config" ),       LFUNCVAL( wifi_ap_config ) },
+  { 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 ) },
+  { LSTRKEY( "dhcp" ),         LROVAL( wifi_ap_dhcp_map ) },
+//{ LSTRKEY( "__metatable" ),  LROVAL( wifi_ap_map ) },
   { LNILKEY, LNILVAL }
 };
 
-const LUA_REG_TYPE wifi_map[] = 
-{
-  { LSTRKEY( "setmode" ), LFUNCVAL( wifi_setmode ) },
-  { LSTRKEY( "getmode" ), LFUNCVAL( wifi_getmode ) },
-  { LSTRKEY( "getchannel" ), LFUNCVAL( wifi_getchannel ) },
-  { LSTRKEY( "setphymode" ), LFUNCVAL( wifi_setphymode ) },
-  { LSTRKEY( "getphymode" ), LFUNCVAL( wifi_getphymode ) },
-  { LSTRKEY( "sleep" ), LFUNCVAL( wifi_sleep ) },
-  { LSTRKEY( "startsmart" ), LFUNCVAL( wifi_start_smart ) },
-  { LSTRKEY( "stopsmart" ), LFUNCVAL( wifi_exit_smart ) },
-  { LSTRKEY( "sleeptype" ), LFUNCVAL( wifi_sleeptype ) },
+const LUA_REG_TYPE wifi_map[] =  {
+  { LSTRKEY( "setmode" ),        LFUNCVAL( wifi_setmode ) },
+  { LSTRKEY( "getmode" ),        LFUNCVAL( wifi_getmode ) },
+  { LSTRKEY( "getchannel" ),     LFUNCVAL( wifi_getchannel ) },
+  { LSTRKEY( "setphymode" ),     LFUNCVAL( wifi_setphymode ) },
+  { LSTRKEY( "getphymode" ),     LFUNCVAL( wifi_getphymode ) },
+  { LSTRKEY( "sleep" ),          LFUNCVAL( wifi_sleep ) },
+  { LSTRKEY( "startsmart" ),     LFUNCVAL( wifi_start_smart ) },
+  { LSTRKEY( "stopsmart" ),      LFUNCVAL( wifi_exit_smart ) },
+  { LSTRKEY( "sleeptype" ),      LFUNCVAL( wifi_sleeptype ) },
 
-  { LSTRKEY( "sta" ), LROVAL( wifi_station_map ) },
-  { LSTRKEY( "ap" ), LROVAL( wifi_ap_map ) },
+  { LSTRKEY( "sta" ),            LROVAL( wifi_station_map ) },
+  { LSTRKEY( "ap" ),             LROVAL( wifi_ap_map ) },
 
-  { LSTRKEY( "NULLMODE" ), LNUMVAL( NULL_MODE ) },
-  { LSTRKEY( "STATION" ), LNUMVAL( STATION_MODE ) },
-  { LSTRKEY( "SOFTAP" ), LNUMVAL( SOFTAP_MODE ) },
-  { LSTRKEY( "STATIONAP" ), LNUMVAL( STATIONAP_MODE ) },
+  { 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( "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( "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( "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( "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( "__metatable" ), LROVAL( wifi_map ) },
+  { LSTRKEY( "__metatable" ),    LROVAL( wifi_map ) },
   { LNILKEY, LNILVAL }
 };
 
 LUALIB_API int luaopen_wifi( lua_State *L )
 {
+#if MIN_OPT_LEVEL==2 && LUA_OPTIMIZE_MEMORY==2
   return 0;
+#else
+#  error "NodeMCU modules must be build with LTR enabled (MIN_OPT_LEVEL=2 and LUA_OPTIMIZE_MEMORY=2)" 
+#endif
 }
diff --git a/app/platform/platform.h b/app/platform/platform.h
index b4d3a00a..c904e5dc 100644
--- a/app/platform/platform.h
+++ b/app/platform/platform.h
@@ -243,4 +243,20 @@ int platform_flash_erase_sector( uint32_t sector_id );
 void* platform_get_first_free_ram( unsigned id );
 void* platform_get_last_free_ram( unsigned id );
 
+// *****************************************************************************
+// Helper macros
+#define MOD_CHECK_ID( mod, id )\
+  if( !platform_ ## mod ## _exists( id ) )\
+    return luaL_error( L, #mod" %d does not exist", ( unsigned )id )
+
+#define MOD_CHECK_TIMER( id )\
+  if( id == PLATFORM_TIMER_SYS_ID && !platform_timer_sys_available() )\
+    return luaL_error( L, "the system timer is not available on this platform" );\
+  if( !platform_timer_exists( id ) )\
+    return luaL_error( L, "timer %d does not exist", ( unsigned )id )\
+
+#define MOD_CHECK_RES_ID( mod, id, resmod, resid )\
+  if( !platform_ ## mod ## _check_ ## resmod ## _id( id, resid ) )\
+    return luaL_error( L, #resmod" %d not valid with " #mod " %d", ( unsigned )resid, ( unsigned )id )
+
 #endif