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

Modifications according to #6368 comments

Browse source
This commit is contained in:
Bertrand Songis 2019-06-14 08:21:45 +02:00
parent a1e146bd63
commit 8773c56dad
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1077,10 +1077,10 @@ Returns radio timers
static int luaGetGlobalTimer(lua_State * L)
{
lua_newtable(L);
lua_pushtableinteger(L, "gtimer", g_eeGeneral.globalTimer + sessionTimer);
lua_pushtableinteger(L, "total", g_eeGeneral.globalTimer + sessionTimer);
lua_pushtableinteger(L, "session", sessionTimer);
lua_pushtableinteger(L, "ttimer", s_timeCumThr);
lua_pushtableinteger(L, "tptimer", s_timeCum16ThrP/16);
lua_pushtableinteger(L, "throttle", s_timeCumThr);
lua_pushtableinteger(L, "throttlepct", s_timeCum16ThrP/16);
return 1;
}
@ -1441,21 +1441,25 @@ static int luaGetUsage(lua_State * L)
*/
static int luaResetGlobalTimer(lua_State * L)
{
g_eeGeneral.globalTimer = 0;
size_t length;
const char *option = luaL_optlstring(L, 1, "", &length);
const char * option = luaL_optlstring(L, 1, "all", &length);
if (!strcmp(option, "all")) {
g_eeGeneral.globalTimer = 0;
sessionTimer = 0;
s_timeCumThr = 0;
s_timeCum16ThrP = 0;
}
else if (!strcmp(option, "total")) {
g_eeGeneral.globalTimer = 0;
sessionTimer = 0;
}
else if (!strcmp(option, "session")) {
sessionTimer = 0;
}
else if (!strcmp(option, "ttimer")) {
else if (!strcmp(option, "throttle")) {
s_timeCumThr = 0;
}
else if (!strcmp(option, "tptimer")) {
else if (!strcmp(option, "throttlepct")) {
s_timeCum16ThrP = 0;
}
storageDirty(EE_GENERAL);