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

fix(color): Clear Lua lcd buffer and display 'Loading...' (#2916)

Browse Source 
* Clear LCD buffer before use for standalone Lua scripts.

* Fix rebase merge issues.

* Add translation.

* Add translation.

* Add translations.

* Add translation/

Co-authored-by: Phil Mitchell <phil.a.mitchell@gmail.com>
This commit is contained in:
philmoz
2022-12-28 10:15:10 +10:00
committed by GitHub
co-authored by Phil Mitchell
parent 8d5a509ce0
commit 277c1cae37
17 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/standalone_lua.cpp
+2
View File
@@ -56,6 +56,8 @@ StandaloneLuaWindow::StandaloneLuaWindow() :
lcdBuffer(BMP_RGB565, LCD_W, LCD_H),
popup({50, 73, LCD_W - 100, LCD_H - 146})
{
lcdBuffer.clear();
lcdBuffer.drawText(LCD_W / 2, LCD_H / 2 - 20, STR_LOADING, FONT(L)|COLOR_THEME_PRIMARY2|CENTERED);
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_SCROLLABLE);
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_CLICK_FOCUSABLE);
radio/src/translations.cpp
+1
View File
@@ -815,6 +815,7 @@ const char STR_MODULES_RX_VERSION[] = TR_MODULES_RX_VERSION;
const char STR_LEFT_STICK[] = TR_LEFT_STICK;
const char STR_SHOW_MIXER_MONITORS[] = TR_SHOW_MIXER_MONITORS;
const char STR_MODEL_QUICK_SELECT[] = TR_MODEL_QUICK_SELECT;
const char STR_LOADING[] = TR_LOADING;
#endif
#if !defined(COLORLCD)
radio/src/translations.h
+1
View File
@@ -724,6 +724,7 @@ extern const char STR_MODULES_RX_VERSION[];
extern const char STR_LEFT_STICK[];
extern const char STR_SHOW_MIXER_MONITORS[];
extern const char STR_MODEL_QUICK_SELECT[];
extern const char STR_LOADING[];
#endif
extern const char STR_EXECUTE_FILE[];
extern const char STR_DELETE_FILE[];
radio/src/translations/cn.h
+1
View File
@@ -761,6 +761,7 @@
#define TR_BAUDRATE "波特率"
#define TR_SAMPLE_MODE "采样模式"
#define TR_SAMPLE_MODES "标准","OneBit"
#define TR_LOADING "加载中..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "快速选择模型"
radio/src/translations/cz.h
+1
View File
@@ -779,6 +779,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Načítání..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Rychlý výběr modelu"
radio/src/translations/da.h
+1
View File
@@ -766,6 +766,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Måle tilstand"
#define TR_SAMPLE_MODES "Normal","EnBit"
#define TR_LOADING "Indlæser..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Hurtigvalg af model"
radio/src/translations/de.h
+1 -1
View File
@@ -760,8 +760,8 @@
#define TR_BAUDRATE "Baudrate"
#define TR_MAXBAUDRATE "Max Baud"
#define TR_SAMPLE_MODE "Abtastmodus"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Wird geladen..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "schnelle Modellauswahl"
radio/src/translations/en.h
+1
View File
@@ -761,6 +761,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Model quick select"
radio/src/translations/es.h
+1 -1
View File
@@ -760,9 +760,9 @@
#define TR_TIME "Hora"
#define TR_MAXBAUDRATE "Máx bauds"
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Modo de muestra"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Model quick select"
radio/src/translations/fi.h
+1
View File
@@ -788,6 +788,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Mallin pikavalinta"
radio/src/translations/fr.h
+1
View File
@@ -782,6 +782,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal""OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Model quick select"
radio/src/translations/it.h
+1
View File
@@ -762,6 +762,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Modo Semplice"
#define TR_SAMPLE_MODES "Normale","OneBit"
#define TR_LOADING "Caricamento..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Selezione veloce modello"
radio/src/translations/jp.h
+1
View File
@@ -761,6 +761,7 @@
#define TR_BAUDRATE "ボーレート"
#define TR_SAMPLE_MODE "サンプルモード"
#define TR_SAMPLE_MODES "標準","OneBit"
#define TR_LOADING "読み込み中..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "モデル クイックセレクト"
radio/src/translations/nl.h
+1
View File
@@ -767,6 +767,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal""OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Model quick select"
radio/src/translations/pl.h
+1
View File
@@ -758,6 +758,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Ładowanie..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Szybki wybór modelu"
radio/src/translations/pt.h
+1
View File
@@ -764,6 +764,7 @@
#define TR_BAUDRATE "Baudrate"
#define TR_SAMPLE_MODE "Sample Mode"
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Loading..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Model quick select"
radio/src/translations/se.h
+1
View File
@@ -802,6 +802,7 @@
#define TR_MAXBAUDRATE "Max bauds"
#define TR_SAMPLE_MODE TR("Sample mod.", "Sample Mode")
#define TR_SAMPLE_MODES "Normal","OneBit"
#define TR_LOADING "Laddar..."
#if defined(COLORLCD)
#define TR_MODEL_QUICK_SELECT "Snabbval av modell"