Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 11:59:50 +03:00
Code Issues Wiki Activity

Improve script errors output for small lcds

Browse source
This commit is contained in:
Daniel 2020-12-22 08:37:14 +01:00
parent 2e8e5d9c55
commit fa8f52281c
12 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
radio/src/lua/interface.cpp
View file

@ -745,11 +745,23 @@ void displayLuaError(const char * title)
if (lua_warning_info[0]) { if (lua_warning_info[0]) {
char * split = strstr(lua_warning_info, ": "); char * split = strstr(lua_warning_info, ": ");
if (split) { if (split) {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, split-lua_warning_info, SMLSIZE); #if LCD_W == 128
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+2*FH+2, split+2, lua_warning_info+LUA_WARNING_INFO_LEN-split, SMLSIZE); if (strlen(split + 2) <= 20) {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + FH + 3, lua_warning_info, split - lua_warning_info, SMLSIZE);
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 2 * FH + 2, split + 2, strlen(split + 2), SMLSIZE);
}
else {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + FH, lua_warning_info, split - lua_warning_info, SMLSIZE);
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 2 * FH, split + 2, 20, SMLSIZE);
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 3 * FH, split + 22, strlen(split + 22), SMLSIZE);
}
#else
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + FH + 3, lua_warning_info, split - lua_warning_info, SMLSIZE);
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + 2 * FH + 2, split + 2, lua_warning_info + LUA_WARNING_INFO_LEN - split, SMLSIZE);
#endif
} }
else { else {
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH+3, lua_warning_info, 40, SMLSIZE); lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y + FH + 3, lua_warning_info, 40, SMLSIZE);
} }
} }
} }
@ -787,7 +799,11 @@ void luaError(lua_State * L, uint8_t error, bool acknowledge)
#if defined(SIMU) #if defined(SIMU)
if (!strncmp(msg, ".", 2)) msg += 1; if (!strncmp(msg, ".", 2)) msg += 1;
#endif #endif
#if LCD_W == 128
msg = strrchr(msg, '/') + 1;
#else
if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9; if (!strncmp(msg, "/SCRIPTS/", 9)) msg += 9;
#endif
strncpy(lua_warning_info, msg, LUA_WARNING_INFO_LEN); strncpy(lua_warning_info, msg, LUA_WARNING_INFO_LEN);
lua_warning_info[LUA_WARNING_INFO_LEN] = '\0'; lua_warning_info[LUA_WARNING_INFO_LEN] = '\0';
} }

2
radio/src/translations/cz.h.txt
View file

@ -780,7 +780,7 @@
#define TR_NO_MODELS_ON_SD "žádný model" BREAKSPACE "na SD" #define TR_NO_MODELS_ON_SD "žádný model" BREAKSPACE "na SD"
#define TR_NO_BITMAPS_ON_SD "žádné obrázky" BREAKSPACE "na SD" #define TR_NO_BITMAPS_ON_SD "žádné obrázky" BREAKSPACE "na SD"
#define TR_NO_SCRIPTS_ON_SD "žádný skript" BREAKSPACE "na SD" #define TR_NO_SCRIPTS_ON_SD "žádný skript" BREAKSPACE "na SD"
#define TR_SCRIPT_SYNTAX_ERROR "Syntaktická chyba skriptu" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntaktická chyba", "Syntaktická chyba skriptu")
#define TR_SCRIPT_PANIC "Script zmaten" #define TR_SCRIPT_PANIC "Script zmaten"
#define TR_SCRIPT_KILLED "Script ukončen" #define TR_SCRIPT_KILLED "Script ukončen"
#define TR_SCRIPT_ERROR "Neznámá chyba" #define TR_SCRIPT_ERROR "Neznámá chyba"

2
radio/src/translations/de.h.txt
View file

@ -782,7 +782,7 @@
#define TR_NO_MODELS_ON_SD "Kein Modelle" BREAKSPACE "auf SD" #define TR_NO_MODELS_ON_SD "Kein Modelle" BREAKSPACE "auf SD"
#define TR_NO_BITMAPS_ON_SD "Keine Bitmaps" BREAKSPACE "auf SD" #define TR_NO_BITMAPS_ON_SD "Keine Bitmaps" BREAKSPACE "auf SD"
#define TR_NO_SCRIPTS_ON_SD "Keine Skripte" BREAKSPACE "auf SD" #define TR_NO_SCRIPTS_ON_SD "Keine Skripte" BREAKSPACE "auf SD"
#define TR_SCRIPT_SYNTAX_ERROR "Skript Syntaxfehler" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntaxfehler", "Skript Syntaxfehler")
#define TR_SCRIPT_PANIC "Skript Panik" #define TR_SCRIPT_PANIC "Skript Panik"
#define TR_SCRIPT_KILLED "Skript beendet" #define TR_SCRIPT_KILLED "Skript beendet"
#define TR_SCRIPT_ERROR "Unbekannter Fehler" #define TR_SCRIPT_ERROR "Unbekannter Fehler"

2
radio/src/translations/en.h.txt
View file

@ -786,7 +786,7 @@
#define TR_NO_MODELS_ON_SD "No models" BREAKSPACE "on SD" #define TR_NO_MODELS_ON_SD "No models" BREAKSPACE "on SD"
#define TR_NO_BITMAPS_ON_SD "No bitmaps" BREAKSPACE "on SD" #define TR_NO_BITMAPS_ON_SD "No bitmaps" BREAKSPACE "on SD"
#define TR_NO_SCRIPTS_ON_SD "No scripts" BREAKSPACE "on SD" #define TR_NO_SCRIPTS_ON_SD "No scripts" BREAKSPACE "on SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Unknown error" #define TR_SCRIPT_ERROR "Unknown error"

2
radio/src/translations/es.h.txt
View file

@ -783,7 +783,7 @@
#define TR_NO_MODELS_ON_SD "Sin modelos en SD" #define TR_NO_MODELS_ON_SD "Sin modelos en SD"
#define TR_NO_BITMAPS_ON_SD "Sin imágenes en SD" #define TR_NO_BITMAPS_ON_SD "Sin imágenes en SD"
#define TR_NO_SCRIPTS_ON_SD "No scripts en SD" #define TR_NO_SCRIPTS_ON_SD "No scripts en SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Error desconocido" #define TR_SCRIPT_ERROR "Error desconocido"

2
radio/src/translations/fi.h.txt
View file

@ -799,7 +799,7 @@
#define TR_NO_MODELS_ON_SD "No Models on SD" #define TR_NO_MODELS_ON_SD "No Models on SD"
#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD" #define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD"
#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD" #define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Unknown error" #define TR_SCRIPT_ERROR "Unknown error"

2
radio/src/translations/fr.h.txt
View file

@ -802,7 +802,7 @@
#define TR_NO_MODELS_ON_SD "Aucun modèle SD" #define TR_NO_MODELS_ON_SD "Aucun modèle SD"
#define TR_NO_BITMAPS_ON_SD "Aucun Bitmap SD" #define TR_NO_BITMAPS_ON_SD "Aucun Bitmap SD"
#define TR_NO_SCRIPTS_ON_SD "Aucun Script SD" #define TR_NO_SCRIPTS_ON_SD "Aucun Script SD"
#define TR_SCRIPT_SYNTAX_ERROR "Erreur syntaxe script" #define TR_SCRIPT_SYNTAX_ERROR TR("Erreur syntaxe", "Erreur syntaxe script")
#define TR_SCRIPT_PANIC "Script bloqué" #define TR_SCRIPT_PANIC "Script bloqué"
#define TR_SCRIPT_KILLED "Script interrompu" #define TR_SCRIPT_KILLED "Script interrompu"
#define TR_SCRIPT_ERROR "Erreur inconnue" #define TR_SCRIPT_ERROR "Erreur inconnue"

2
radio/src/translations/it.h.txt
View file

@ -801,7 +801,7 @@
#define TR_NO_MODELS_ON_SD "No Model." BREAKSPACE "su SD" #define TR_NO_MODELS_ON_SD "No Model." BREAKSPACE "su SD"
#define TR_NO_BITMAPS_ON_SD "No Immag." BREAKSPACE "su SD" #define TR_NO_BITMAPS_ON_SD "No Immag." BREAKSPACE "su SD"
#define TR_NO_SCRIPTS_ON_SD "No Scripts" BREAKSPACE "su SD" #define TR_NO_SCRIPTS_ON_SD "No Scripts" BREAKSPACE "su SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script errore sintassi" #define TR_SCRIPT_SYNTAX_ERROR TR("Errore sintassi", "Script errore sintassi")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script fermato" #define TR_SCRIPT_KILLED "Script fermato"
#define TR_SCRIPT_ERROR "Errore sconosciuto" #define TR_SCRIPT_ERROR "Errore sconosciuto"

2
radio/src/translations/nl.h.txt
View file

@ -787,7 +787,7 @@
#define TR_NO_MODELS_ON_SD "Geen Modellen" BREAKSPACE "op SD" #define TR_NO_MODELS_ON_SD "Geen Modellen" BREAKSPACE "op SD"
#define TR_NO_BITMAPS_ON_SD "Geen Bitmaps" BREAKSPACE "op SD" #define TR_NO_BITMAPS_ON_SD "Geen Bitmaps" BREAKSPACE "op SD"
#define TR_NO_SCRIPTS_ON_SD "Geen Scripts" BREAKSPACE "op SD" #define TR_NO_SCRIPTS_ON_SD "Geen Scripts" BREAKSPACE "op SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Unknown error" #define TR_SCRIPT_ERROR "Unknown error"

2
radio/src/translations/pl.h.txt
View file

@ -800,7 +800,7 @@
#define TR_NO_MODELS_ON_SD "Brak modelu na SD" #define TR_NO_MODELS_ON_SD "Brak modelu na SD"
#define TR_NO_BITMAPS_ON_SD "Brak obrazków na SD" #define TR_NO_BITMAPS_ON_SD "Brak obrazków na SD"
#define TR_NO_SCRIPTS_ON_SD "Brak skryptów na SD" #define TR_NO_SCRIPTS_ON_SD "Brak skryptów na SD"
#define TR_SCRIPT_SYNTAX_ERROR "Skrypt:syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Skrypt:syntax error")
#define TR_SCRIPT_PANIC "Skrypt:panic" #define TR_SCRIPT_PANIC "Skrypt:panic"
#define TR_SCRIPT_KILLED "Skrypt:killed" #define TR_SCRIPT_KILLED "Skrypt:killed"
#define TR_SCRIPT_ERROR "Nieznany błąd" #define TR_SCRIPT_ERROR "Nieznany błąd"

2
radio/src/translations/pt.h.txt
View file

@ -801,7 +801,7 @@
#define TR_NO_MODELS_ON_SD "Sem Modelo no SD" #define TR_NO_MODELS_ON_SD "Sem Modelo no SD"
#define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD" #define TR_NO_BITMAPS_ON_SD "No Bitmaps on SD"
#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD" #define TR_NO_SCRIPTS_ON_SD "No Scripts on SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Unknown error" #define TR_SCRIPT_ERROR "Unknown error"

2
radio/src/translations/se.h.txt
View file

@ -800,7 +800,7 @@
#define TR_NO_MODELS_ON_SD "Ingen modell i SD" #define TR_NO_MODELS_ON_SD "Ingen modell i SD"
#define TR_NO_BITMAPS_ON_SD "Ikoner saknas på SD" #define TR_NO_BITMAPS_ON_SD "Ikoner saknas på SD"
#define TR_NO_SCRIPTS_ON_SD "Programkod saknas på SD" #define TR_NO_SCRIPTS_ON_SD "Programkod saknas på SD"
#define TR_SCRIPT_SYNTAX_ERROR "Script syntax error" #define TR_SCRIPT_SYNTAX_ERROR TR("Syntax error", "Script syntax error")
#define TR_SCRIPT_PANIC "Script panic" #define TR_SCRIPT_PANIC "Script panic"
#define TR_SCRIPT_KILLED "Script killed" #define TR_SCRIPT_KILLED "Script killed"
#define TR_SCRIPT_ERROR "Unknown error" #define TR_SCRIPT_ERROR "Unknown error"