Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 21:05:26 +03:00
Code Issues Wiki Activity

Fixes #3344: radio and voice language returned in Lua getGeneralSettings()

Browse source
This commit is contained in:
Damjan Adamic 2016-03-13 18:26:08 +01:00
parent 129b46ed2b
commit d5db9b7410
1 changed files with 4 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -694,6 +694,8 @@ Returns (some of) the general radio settings
* `battMax` (number) radio battery range - maximum value * `battMax` (number) radio battery range - maximum value
* `imperial` (number) set to a value different from 0 if the radio is set to the * `imperial` (number) set to a value different from 0 if the radio is set to the
IMPERIAL units IMPERIAL units
* `language` (string) radio language (used for menus)
* `voice` (string) voice language (used for speech)
@status current Introduced in 2.0.6, `imperial` added in TODO @status current Introduced in 2.0.6, `imperial` added in TODO
@ -704,41 +706,8 @@ static int luaGetGeneralSettings(lua_State *L)
lua_pushtablenumber(L, "battMin", double(90+g_eeGeneral.vBatMin)/10); lua_pushtablenumber(L, "battMin", double(90+g_eeGeneral.vBatMin)/10);
lua_pushtablenumber(L, "battMax", double(120+g_eeGeneral.vBatMax)/10); lua_pushtablenumber(L, "battMax", double(120+g_eeGeneral.vBatMax)/10);
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial); lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
return 1; lua_pushtablestring(L, "language", TRANSLATIONS);
} lua_pushtablestring(L, "voice", currentLanguagePack->id);
/*luadoc
@function getLanguage()
Returns the radio language
@retval returns the radio language
@status current Introduced in 2.2.0
*/
static int luaGetLanguage(lua_State * L)
{
lua_pushstring(L, TRANSLATIONS);
return 1;
}
/*luadoc
@function getTTSLanguage()
Returns the current TTS language
@retval returns the TTS language
@status current Introduced in 2.2.0
*/
static int luaGetTTSLanguage(lua_State * L)
{
char ttsLanguage[sizeof(g_eeGeneral.ttsLanguage)+1];
memcpy(ttsLanguage, g_eeGeneral.ttsLanguage, sizeof(g_eeGeneral.ttsLanguage));
ttsLanguage[sizeof(g_eeGeneral.ttsLanguage)] = '\0';
lua_pushstring(L, ttsLanguage);
return 1; return 1;
} }
@ -841,8 +810,6 @@ const luaL_Reg opentxLib[] = {
{ "getDateTime", luaGetDateTime }, { "getDateTime", luaGetDateTime },
{ "getVersion", luaGetVersion }, { "getVersion", luaGetVersion },
{ "getGeneralSettings", luaGetGeneralSettings }, { "getGeneralSettings", luaGetGeneralSettings },
{ "getLanguage", luaGetLanguage },
{ "getTTSLanguage", luaGetTTSLanguage },
{ "getValue", luaGetValue }, { "getValue", luaGetValue },
{ "getFieldInfo", luaGetFieldInfo }, { "getFieldInfo", luaGetFieldInfo },
{ "getFlightMode", luaGetFlightMode }, { "getFlightMode", luaGetFlightMode },