From 295e640a7a96501447f7052d9577ceb6339acc26 Mon Sep 17 00:00:00 2001 From: dnc40085 Date: Sat, 5 Aug 2017 14:05:26 -0700 Subject: [PATCH 1/2] Comment out pmsleep and timer_suspend options in user_config.h for master drop --- app/include/user_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/include/user_config.h b/app/include/user_config.h index f7c2a467..0160d840 100644 --- a/app/include/user_config.h +++ b/app/include/user_config.h @@ -114,8 +114,8 @@ extern void luaL_assertfail(const char *file, int line, const char *message); #define WIFI_SDK_EVENT_MONITOR_ENABLE #define WIFI_EVENT_MONITOR_DISCONNECT_REASON_LIST_ENABLE -#define ENABLE_TIMER_SUSPEND -#define PMSLEEP_ENABLE +////#define ENABLE_TIMER_SUSPEND +//#define PMSLEEP_ENABLE #define STRBUF_DEFAULT_INCREMENT 32 From c9e86218213b52a93713f7a6bf80c455ca3899ea Mon Sep 17 00:00:00 2001 From: dnc40085 Date: Sat, 5 Aug 2017 14:46:14 -0700 Subject: [PATCH 2/2] fix for travisCI --- app/modules/tmr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/modules/tmr.c b/app/modules/tmr.c index 19f416e4..c81c5365 100755 --- a/app/modules/tmr.c +++ b/app/modules/tmr.c @@ -428,7 +428,7 @@ static int tmr_create( lua_State *L ) { } -#if defined(SWTMR_DEBUG) +#if defined(ENABLE_TIMER_SUSPEND) && defined(SWTMR_DEBUG) static void tmr_printRegistry(lua_State* L){ swtmr_print_registry(); } @@ -463,7 +463,7 @@ static const LUA_REG_TYPE tmr_dyn_map[] = { { LNILKEY, LNILVAL } }; -#if defined(SWTMR_DEBUG) +#if defined(ENABLE_TIMER_SUSPEND) && defined(SWTMR_DEBUG) static const LUA_REG_TYPE tmr_dbg_map[] = { { LSTRKEY( "printRegistry" ), LFUNCVAL( tmr_printRegistry ) }, { LSTRKEY( "printSuspended" ), LFUNCVAL( tmr_printSuspended ) }, @@ -492,7 +492,7 @@ static const LUA_REG_TYPE tmr_map[] = { { LSTRKEY( "state" ), LFUNCVAL( tmr_state ) }, { LSTRKEY( "interval" ), LFUNCVAL( tmr_interval ) }, { LSTRKEY( "create" ), LFUNCVAL( tmr_create ) }, -#if defined(SWTMR_DEBUG) +#if defined(ENABLE_TIMER_SUSPEND) && defined(SWTMR_DEBUG) { LSTRKEY( "debug" ), LROVAL( tmr_dbg_map ) }, #endif { LSTRKEY( "ALARM_SINGLE" ), LNUMVAL( TIMER_MODE_SINGLE ) },