Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 12:25:12 +03:00
Code Issues Wiki Activity

Add American time format to lua getDateTime() (#5431)

Browse source 
Add American time format to lua getDateTime()
This commit is contained in:
3djc 2017-11-29 09:18:50 +01:00 • committed by Bertrand Songis
parent 779b39e237
commit 13f364d96a
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
radio/src/lua/api_general.cpp
View file

@ -122,13 +122,28 @@ static int luaGetTime(lua_State * L)
static void luaPushDateTime(lua_State * L, uint32_t year, uint32_t mon, uint32_t day, static void luaPushDateTime(lua_State * L, uint32_t year, uint32_t mon, uint32_t day,
uint32_t hour, uint32_t min, uint32_t sec) uint32_t hour, uint32_t min, uint32_t sec)
{ {
lua_createtable(L, 0, 6); uint32_t hour12 = hour;
if (hour == 0) {
hour12 = 12;
}
else if (hour > 12) {
hour12 = hour - 12;
}
lua_createtable(L, 0, 8);
lua_pushtableinteger(L, "year", year); lua_pushtableinteger(L, "year", year);
lua_pushtableinteger(L, "mon", mon); lua_pushtableinteger(L, "mon", mon);
lua_pushtableinteger(L, "day", day); lua_pushtableinteger(L, "day", day);
lua_pushtableinteger(L, "hour", hour); lua_pushtableinteger(L, "hour", hour);
lua_pushtableinteger(L, "min", min); lua_pushtableinteger(L, "min", min);
lua_pushtableinteger(L, "sec", sec); lua_pushtableinteger(L, "sec", sec);
lua_pushtableinteger(L, "hour12", hour12);
if (hour < 12) {
lua_pushtablestring(L, "suffix", "am");
}
else {
lua_pushtablestring(L, "suffix", "pm");
}
} }
/*luadoc /*luadoc
@ -141,8 +156,10 @@ Return current system date and time that is kept by the RTC unit
* `mon` (number) month * `mon` (number) month
* `day` (number) day of month * `day` (number) day of month
* `hour` (number) hours * `hour` (number) hours
* `hour12` (number) hours in US format
* `min` (number) minutes * `min` (number) minutes
* `sec` (number) seconds * `sec` (number) seconds
* `suffix` (text) am or pm
*/ */
static int luaGetDateTime(lua_State * L) static int luaGetDateTime(lua_State * L)
{ {
@ -773,6 +790,8 @@ static int luaPlayHaptic(lua_State * L)
int pause = luaL_checkinteger(L, 2); int pause = luaL_checkinteger(L, 2);
int flags = luaL_optinteger(L, 3, 0); int flags = luaL_optinteger(L, 3, 0);
haptic.play(length, pause, flags); haptic.play(length, pause, flags);
#else
UNUSED(L);
#endif #endif
return 0; return 0;
} }