Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 20:10:08 +03:00
Code Issues Wiki Activity

Add name handling to LUA timer functions (#7358)

Browse source 
Add timer name to LUA timer functions
This commit is contained in:
3djc 2020-02-06 14:36:21 +01:00 • committed by GitHub
parent 4c94dd3ba0
commit 40d57a8853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
radio/src/lua/api_model.cpp
View file

@ -182,8 +182,9 @@ Get model timer parameters
* `countdownBeep` (number) countdown beep (0­ = silent, 1 =­ beeps, 2­ = voice) * `countdownBeep` (number) countdown beep (0­ = silent, 1 =­ beeps, 2­ = voice)
* `minuteBeep` (boolean) minute beep * `minuteBeep` (boolean) minute beep
* `persistent` (number) persistent timer * `persistent` (number) persistent timer
* `name` (string) timer name
@status current Introduced in 2.0.0 @status current Introduced in 2.0.0, name added in 2.3.6
*/ */
static int luaModelGetTimer(lua_State *L) static int luaModelGetTimer(lua_State *L)
{ {
@ -197,6 +198,7 @@ static int luaModelGetTimer(lua_State *L)
lua_pushtableinteger(L, "countdownBeep", timer.countdownBeep); lua_pushtableinteger(L, "countdownBeep", timer.countdownBeep);
lua_pushtableboolean(L, "minuteBeep", timer.minuteBeep); lua_pushtableboolean(L, "minuteBeep", timer.minuteBeep);
lua_pushtableinteger(L, "persistent", timer.persistent); lua_pushtableinteger(L, "persistent", timer.persistent);
lua_pushtablezstring(L, "name", timer.name);
} }
else { else {
lua_pushnil(L); lua_pushnil(L);
@ -216,7 +218,7 @@ Set model timer parameters
@notice If a parameter is missing from the value, then @notice If a parameter is missing from the value, then
that parameter remains unchanged. that parameter remains unchanged.
@status current Introduced in 2.0.0 @status current Introduced in 2.0.0, name added in 2.3.6
*/ */
static int luaModelSetTimer(lua_State *L) static int luaModelSetTimer(lua_State *L)
{ {
@ -246,6 +248,10 @@ static int luaModelSetTimer(lua_State *L)
else if (!strcmp(key, "persistent")) { else if (!strcmp(key, "persistent")) {
timer.persistent = luaL_checkinteger(L, -1); timer.persistent = luaL_checkinteger(L, -1);
} }
if (!strcmp(key, "name")) {
const char * name = luaL_checkstring(L, -1);
str2zchar(timer.name, name, sizeof(timer.name));
}
} }
storageDirty(EE_MODEL); storageDirty(EE_MODEL);
} }