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

Lua error display function reused

Browse source
This commit is contained in:
Bertrand Songis 2015-09-25 17:44:32 +02:00
parent e57361f7e1
commit 3f6e1d0b3a
15 changed files with 73 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

27
radio/src/lua_api.cpp
View file

@ -1826,41 +1826,50 @@ void luaLoadPermanentScripts()
char lua_warning_str[WARNING_LINE_LEN+1];
char lua_warning_info[WARNING_LINE_LEN+1];
void luaError(uint8_t error)
void luaError(uint8_t error, bool exit_button=false)
{
const char *msg = lua_tostring(L, -1);
const char * msg = lua_tostring(L, -1);
if (msg) {
#if defined(SIMU)
if (!strncmp(msg, "./", 2)) msg += 2;
#else
if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9;
if (!strncmp(msg, ".", 2)) msg += 1;
#endif
if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9;
strncpy(lua_warning_str, msg, WARNING_LINE_LEN);
lua_warning_str[WARNING_LINE_LEN] = '\0';
POPUP_WARNING(lua_warning_str);
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 {
switch (error) {
case SCRIPT_SYNTAX_ERROR:
msg = "Script syntax error";
msg = STR_SCRIPT_SYNTAX_ERROR;
break;
case SCRIPT_KILLED:
msg = "Script killed";
msg = STR_SCRIPT_KILLED;
break;
case SCRIPT_PANIC:
msg = "Script panic";
msg = STR_SCRIPT_PANIC;
break;
}
}
if (exit_button) {
POPUP_WARNING(msg);
}
else {
displayBox(msg);
lcd_puts(WARNING_LINE_X, WARNING_LINE_Y+FH, lua_warning_info);
}
}
void luaExec(const char *filename)