MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rtctime: change to lua_setfieldfor populating the table (#1746) 

Looks good.
This commit is contained in:
Arnim Läuger 2017-01-22 20:17:46 +01:00 committed by Philip Gladstone
parent 88938b441d
commit 87e1abfb0f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/modules/rtctime.c
View File

@ -180,12 +180,9 @@ static int rtctime_dsleep_aligned (lua_State *L)
} }
static void add_table_item (lua_State *L, const char *key, int val) #define ADD_TABLE_ITEM(L, key, val) \
{ lua_pushinteger (L, val); \
lua_pushstring (L, key); lua_setfield (L, -2, key);
lua_pushinteger (L, val);
lua_rawset (L, -3);
}
// rtctime.epoch2cal (stamp) // rtctime.epoch2cal (stamp)
static int rtctime_epoch2cal (lua_State *L) static int rtctime_epoch2cal (lua_State *L)
@ -198,14 +195,14 @@ static int rtctime_epoch2cal (lua_State *L)
/* construct Lua table */ /* construct Lua table */
lua_createtable (L, 0, 8); lua_createtable (L, 0, 8);
add_table_item (L, "yday", date.tm_yday + 1); ADD_TABLE_ITEM (L, "yday", date.tm_yday + 1);
add_table_item (L, "wday", date.tm_wday + 1); ADD_TABLE_ITEM (L, "wday", date.tm_wday + 1);
add_table_item (L, "year", date.tm_year + 1900); ADD_TABLE_ITEM (L, "year", date.tm_year + 1900);
add_table_item (L, "mon", date.tm_mon + 1); ADD_TABLE_ITEM (L, "mon", date.tm_mon + 1);
add_table_item (L, "day", date.tm_mday); ADD_TABLE_ITEM (L, "day", date.tm_mday);
add_table_item (L, "hour", date.tm_hour); ADD_TABLE_ITEM (L, "hour", date.tm_hour);
add_table_item (L, "min", date.tm_min); ADD_TABLE_ITEM (L, "min", date.tm_min);
add_table_item (L, "sec", date.tm_sec); ADD_TABLE_ITEM (L, "sec", date.tm_sec);
return 1; return 1;
} }