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

Fixes #1914

Browse source
This commit is contained in:
Bertrand Songis 2015-09-25 18:37:24 +02:00
parent 3f6e1d0b3a
commit 60f2535212
3 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/Taranis/view_telemetry.cpp
View file

@ -195,7 +195,7 @@ bool displayTelemetryScreen()
case SCRIPT_SYNTAX_ERROR: case SCRIPT_SYNTAX_ERROR:
case SCRIPT_PANIC: case SCRIPT_PANIC:
case SCRIPT_KILLED: case SCRIPT_KILLED:
luaError(state); luaError(state, false);
return true; return true;
} }
return false; return false;

83
radio/src/lua_api.cpp
View file

@ -1823,52 +1823,71 @@ void luaLoadPermanentScripts()
} }
} }
char lua_warning_str[WARNING_LINE_LEN+1]; #define LUA_WARNING_INFO_LEN 64
char lua_warning_info[WARNING_LINE_LEN+1]; char lua_warning_info[LUA_WARNING_INFO_LEN+1];
void luaError(uint8_t error, bool exit_button=false) void displayLuaError(const char * title)
{ {
const char * msg = lua_tostring(L, -1); displayBox(title);
if (lua_warning_info[0]) {
char * split = strstr(lua_warning_info, ": ");
if (split) {
lcd_putsnAtt(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, split-lua_warning_info, SMLSIZE);
lcd_putsnAtt(WARNING_LINE_X, WARNING_LINE_Y+2*FH+2, split+2, lua_warning_info+LUA_WARNING_INFO_LEN-split, SMLSIZE);
}
else {
lcd_putsnAtt(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, 40, SMLSIZE);
}
}
}
void displayAcknowledgeLuaError(uint8_t event)
{
s_warning_result = false;
displayLuaError(s_warning);
if (event == EVT_KEY_BREAK(KEY_EXIT)) {
s_warning = NULL;
}
}
void luaError(uint8_t error, bool acknowledge)
{
const char * errorTitle;
switch (error) {
case SCRIPT_SYNTAX_ERROR:
errorTitle = STR_SCRIPT_SYNTAX_ERROR;
break;
case SCRIPT_KILLED:
errorTitle = STR_SCRIPT_KILLED;
break;
case SCRIPT_PANIC:
errorTitle = STR_SCRIPT_PANIC;
break;
default:
errorTitle = STR_SCRIPT_ERROR;
break;
}
const char * msg = lua_tostring(L, -1);
if (msg) { if (msg) {
#if defined(SIMU) #if defined(SIMU)
if (!strncmp(msg, ".", 2)) msg += 1; if (!strncmp(msg, ".", 2)) msg += 1;
#endif #endif
if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9; if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9;
strncpy(lua_warning_str, msg, WARNING_LINE_LEN); strncpy(lua_warning_info, msg, LUA_WARNING_INFO_LEN);
lua_warning_str[WARNING_LINE_LEN] = '\0'; lua_warning_info[LUA_WARNING_INFO_LEN] = '\0';
for (int i=0; i<WARNING_LINE_LEN; i++) {
if (msg[i] == ':' && msg[i+1] == ' ') {
lua_warning_str[i] = '\0';
strncpy(lua_warning_info, &msg[i+2], WARNING_LINE_LEN);
lua_warning_info[WARNING_LINE_LEN] = '\0';
SET_WARNING_INFO(lua_warning_info, WARNING_LINE_LEN, 0);
break;
}
}
msg = lua_warning_str;
} }
else { else {
switch (error) { lua_warning_info[0] = '\0';
case SCRIPT_SYNTAX_ERROR:
msg = STR_SCRIPT_SYNTAX_ERROR;
break;
case SCRIPT_KILLED:
msg = STR_SCRIPT_KILLED;
break;
case SCRIPT_PANIC:
msg = STR_SCRIPT_PANIC;
break;
}
} }
if (exit_button) { if (acknowledge) {
POPUP_WARNING(msg); s_warning = errorTitle;
popupFunc = displayAcknowledgeLuaError;
} }
else { else {
displayBox(msg); displayLuaError(errorTitle);
lcd_puts(WARNING_LINE_X, WARNING_LINE_Y+FH, lua_warning_info);
} }
} }

3
radio/src/lua_api.h
View file

@ -95,7 +95,8 @@
extern ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS]; extern ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS];
void luaClose(); void luaClose();
bool luaTask(uint8_t evt, uint8_t scriptType, bool allowLcdUsage); bool luaTask(uint8_t evt, uint8_t scriptType, bool allowLcdUsage);
void luaExec(const char *filename); void luaExec(const char * filename);
void luaError(uint8_t error, bool acknowledge=true);
int luaGetMemUsed(); int luaGetMemUsed();
#define luaGetCpuUsed(idx) scriptInternalData[idx].instructions #define luaGetCpuUsed(idx) scriptInternalData[idx].instructions
uint8_t isTelemetryScriptAvailable(uint8_t index); uint8_t isTelemetryScriptAvailable(uint8_t index);