piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Telemetry "voltages" and "after flight" screens may be overriden by

Browse Source 
telempw.lua and telemaf.lua
This commit is contained in:
bsongis
2014-07-01 12:10:17 +02:00
parent 3c93699f8f
commit 09842fe531
15 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua.cpp
+26 -12
View File
@@ -1293,8 +1293,16 @@ void getTelemetryScriptPath(char * path, uint8_t index)
{
strcpy(path, SCRIPTS_PATH "/");
char * curs = strcat_modelname(path+sizeof(SCRIPTS_PATH), g_eeGeneral.currModel);
strcpy(curs, "/telemX.lua");
curs[6] = '0' + index;
if (index == TELEMETRY_VOLTAGES_SCREEN) {
strcpy(curs, "/telempw.lua");
}
else if (index == TELEMETRY_AFTER_FLIGHT_SCREEN) {
strcpy(curs, "/telemaf.lua");
}
else {
strcpy(curs, "/telemX.lua");
curs[6] = '1' + index;
}
}
bool luaLoadTelemetryScript(uint8_t index)
@@ -1319,7 +1327,7 @@ bool isTelemetryScriptAvailable(uint8_t index)
{
for (int i=0; i<luaScriptsCount; i++) {
ScriptInternalData & sid = scriptInternalData[i];
if (sid.reference == SCRIPT_TELEMETRY_FIRST+index+1) {
if (sid.reference == SCRIPT_TELEMETRY_FIRST+index) {
return true;
}
}
@@ -1340,18 +1348,26 @@ void luaLoadPermanentScripts()
// Load custom function scripts
for (int i=0; i<NUM_CFN; i++) {
if (!luaLoadFunctionScript(i)) {
POPUP_WARNING("Too many Lua scripts!"); // TODO translation
break;
POPUP_WARNING(STR_TOO_MANY_LUA_SCRIPTS);
return;
}
}
// Load telemetry scripts
for (int i=0; i<MAX_SCRIPTS+1; i++) {
// Load custom telemetry scripts
for (int i=0; i<MAX_SCRIPTS; i++) {
if (!luaLoadTelemetryScript(i)) {
POPUP_WARNING("Too many Lua scripts!"); // TODO translation
break;
POPUP_WARNING(STR_TOO_MANY_LUA_SCRIPTS);
return;
}
}
if (!luaLoadTelemetryScript(TELEMETRY_VOLTAGES_SCREEN)) {
POPUP_WARNING(STR_TOO_MANY_LUA_SCRIPTS);
return;
}
if (!luaLoadTelemetryScript(TELEMETRY_AFTER_FLIGHT_SCREEN)) {
POPUP_WARNING(STR_TOO_MANY_LUA_SCRIPTS);
return;
}
}
char lua_warning_str[WARNING_LINE_LEN+1];
@@ -1405,8 +1421,6 @@ void luaExec(const char *filename)
}
}
extern uint8_t s_frsky_view;
void luaTask(uint8_t evt)
{
lcd_locked = false;
@@ -1532,7 +1546,7 @@ void luaTask(uint8_t evt)
#if defined(SIMU) || defined(DEBUG)
filename = "[telem]";
#endif
if (g_menuStack[0]==menuTelemetryFrsky && sid.reference==SCRIPT_TELEMETRY_FIRST+s_frsky_view+1) {
if (g_menuStack[0]==menuTelemetryFrsky && sid.reference==SCRIPT_TELEMETRY_FIRST+s_frsky_view) {
lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
lua_pushinteger(L, evt);
inputsCount = 1;