Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(color): make warning for serial port voltage levels clearer #4697

Merged
merged 10 commits into from
Mar 22, 2024
Merged

feat(color): make warning for serial port voltage levels clearer #4697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
04014b0
Make warning for serial port voltage levels clearer.
Mar 7, 2024
1d4a3d5
Update SE translation.
Mar 13, 2024
cf90f88
Update PL translation
Mar 15, 2024
596cb70
Update DE and RU translations
Mar 15, 2024
b2bee1d
CN, TW and IT translation
Mar 18, 2024
a9337a4
DA translation.
Mar 18, 2024
2a262f8
CZ and FR translations.
Mar 18, 2024
2dd814b
JP translation.
Mar 20, 2024
356cec6
PT translation.
Mar 21, 2024
058f510
chore: update JP fonts
pfeerick Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,293 changes: 2,149 additions & 2,144 deletions radio/src/fonts/lvgl/lv_font_noto_jp_13.c
View file
Open in desktop

Large diffs are not rendered by default.

230 changes: 124 additions & 106 deletions radio/src/fonts/lvgl/lv_font_noto_jp_16.c
View file
Open in desktop

Large diffs are not rendered by default.

7,901 changes: 3,956 additions & 3,945 deletions radio/src/fonts/lvgl/lv_font_noto_jp_24.c
View file
Open in desktop

Large diffs are not rendered by default.

2,670 changes: 1,336 additions & 1,334 deletions radio/src/fonts/lvgl/lv_font_noto_jp_9.c
View file
Open in desktop

Large diffs are not rendered by default.

5,765 changes: 2,886 additions & 2,879 deletions radio/src/fonts/lvgl/lv_font_noto_jp_bold_16.c
View file
Open in desktop

Large diffs are not rendered by default.

11,204 changes: 5,610 additions & 5,594 deletions radio/src/fonts/lvgl/lv_font_noto_jp_bold_32.c
View file
Open in desktop

Large diffs are not rendered by default.

4,396 changes: 2,194 additions & 2,202 deletions radio/src/fonts/lvgl/lv_font_noto_tw_13.c
View file
Open in desktop

Large diffs are not rendered by default.

698 changes: 330 additions & 368 deletions radio/src/fonts/lvgl/lv_font_noto_tw_16.c
View file
Open in desktop

Large diffs are not rendered by default.

12,983 changes: 6,482 additions & 6,501 deletions radio/src/fonts/lvgl/lv_font_noto_tw_24.c
View file
Open in desktop

Large diffs are not rendered by default.

3,841 changes: 1,918 additions & 1,923 deletions radio/src/fonts/lvgl/lv_font_noto_tw_9.c
View file
Open in desktop

Large diffs are not rendered by default.

8,751 changes: 4,369 additions & 4,382 deletions radio/src/fonts/lvgl/lv_font_noto_tw_bold_16.c
View file
Open in desktop

Large diffs are not rendered by default.

9,834 changes: 4,905 additions & 4,929 deletions radio/src/fonts/lvgl/lv_font_noto_tw_bold_32.c
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions radio/src/gui/colorlcd/hw_serial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,10 @@ SerialConfigWindow::SerialConfigWindow(Window *parent, const rect_t &rect) :
setFlexLayout();
FlexGridLayout grid(col_dsc, row_dsc, 2);

bool display_ttl_warning = false;
for (uint8_t port_nr = 0; port_nr < MAX_SERIAL_PORTS; port_nr++) {
auto port = serialGetPort(port_nr);
if (!port || !port->name) continue;

if (port_nr != SP_VCP) display_ttl_warning = true;

auto line = newLine(&grid);
new StaticText(line, rect_t{}, port->name, 0, COLOR_THEME_PRIMARY1);

Expand Down Expand Up @@ -71,11 +68,14 @@ SerialConfigWindow::SerialConfigWindow(Window *parent, const rect_t &rect) :
SET_DIRTY();
});
}
}

if (display_ttl_warning) {
grid.setColSpan(2);
auto line = newLine(&grid);
new StaticText(line, rect_t{}, STR_TTL_WARNING, 0, COLOR_THEME_WARNING);
if (port_nr != SP_VCP) {
grid.setColSpan(2);
auto line = newLine(&grid);
line->padLeft(20);
line->padBottom(6);
new StaticText(line, rect_t{}, STR_TTL_WARNING, 0, COLOR_THEME_WARNING);
grid.setColSpan(1);
}
}
}
2 changes: 1 addition & 1 deletion radio/src/translations/cn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "主板温度"
#define TR_TEMPWARNING INDENT "过热"
#define TR_TTL_WARNING "注意串口使用逻辑电平3.3V"
#define TR_TTL_WARNING "警告: TX和RX引脚电平不能超过3.3V !"
#define TR_FUNC "功能"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Tepl. MB \016>"
#define TR_TEMPWARNING INDENT "Přehřátí"
#define TR_TTL_WARNING "Varování: používat 3.3V hodnoty"
#define TR_TTL_WARNING "Varování: Nepřekračovat napětí 3.3V u pinů pro TX/RX!"
#define TR_FUNC "Funkce"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp."
#define TR_TEMPWARNING INDENT "For varm"
#define TR_TTL_WARNING "Advarsel: brug 3.3V logisk niveau"
#define TR_TTL_WARNING "Advarsel: Spænding på TX/RX poler må ikke overstige 3,3V!"
#define TR_FUNC "Funktion"
#define TR_V1 TR("V1", "Værdi 1")
#define TR_V2 TR("V2", "Værdi 2")
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@
#define TR_COPROC "CoProz."
#define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_TEMPWARNING INDENT "Temp. größer" //wg 9XR-Pro
#define TR_TTL_WARNING "Warning: use 3.3V logic levels"
#define TR_TTL_WARNING "Warnung: An den TX/RX Pins dürfen 3.3V nicht überschritten werden!"
#define TR_FUNC "Funktion"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp."
#define TR_TEMPWARNING INDENT "Overheat"
#define TR_TTL_WARNING "Warning: use 3.3V logic levels"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Function"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_TEMPWARNING INDENT "Sobrecalent"
#define TR_TTL_WARNING "Warning: use 3.3V logic levels"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Función"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/fi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_TEMPWARNING INDENT "Ylikuumentunut"
#define TR_TTL_WARNING "Varoitus: käytä 3,3V:n logiikkatasoja"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Func"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Temp. CM \016>"
#define TR_TEMPWARNING INDENT "Surchauffe"
#define TR_TTL_WARNING "Attention: utiliser valeur logique 3.3 V"
#define TR_TTL_WARNING "Attention: Ne pas excéder 3.3V aux pins TX/RX !"
#define TR_FUNC "Fonction"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/he.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp."
#define TR_TEMPWARNING INDENT "Overheat"
#define TR_TTL_WARNING "אזהרה חיבורים אלה עם מתח 3.3 וולט !"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Function"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Temp. MB \016>"
#define TR_TEMPWARNING INDENT "Temp. Alta"
#define TR_TTL_WARNING "Attenzione: usa livelli logici 3.3V"
#define TR_TTL_WARNING "Attenzione: non superare 3.3V sui TX/RX pins!"
#define TR_FUNC "Funzione"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/jp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB温度"
#define TR_TEMPWARNING INDENT "オーバーヒートです"
#define TR_TTL_WARNING "警告: 論理値3.3Vを使用します"
#define TR_TTL_WARNING "警告: TX/RXピンは3.3Vを超えてはいけません！"
#define TR_FUNC "ファンクション"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/nl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp. \016>"
#define TR_TEMPWARNING INDENT "Overhitting" //wg 9XR-Pro
#define TR_TTL_WARNING "Warning: use 3.3V logic levels"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Funktie"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/pl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "Temp. MB"
#define TR_TEMPWARNING INDENT "Przegrzanie"
#define TR_TTL_WARNING "Uwaga: use 3.3V logic levels"
#define TR_TTL_WARNING "Uwaga: Nie przekraczaj 3.3V na pinach TX/RX!"
#define TR_FUNC "Funkcja"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/pt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB Temp."
#define TR_TEMPWARNING INDENT "SobrAquec."
#define TR_TTL_WARNING "Alerta: use 3.3V logic levels"
#define TR_TTL_WARNING "Aviso: Não exceder 3,3V nos pinos TX/RX !"
#define TR_FUNC "Funcao"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@
#define TR_COPROC "Сопроцессор"
#define TR_COPROC_TEMP "Темпер сопроц"
#define TR_TEMPWARNING INDENT "Перегрев"
#define TR_TTL_WARNING "Предупреждение: испол лог уровни 3.3В"
#define TR_TTL_WARNING "Внимание: Не превышать напряжение 3,3 В на выводах TX/RX !"
#define TR_FUNC "Функция"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/se.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "MB temp. \016>"
#define TR_TEMPWARNING TR(INDENT "Hög temp", INDENT "Hög temperatur")
#define TR_TTL_WARNING "Varning: använd 3.3V logiska nivåer"
#define TR_TTL_WARNING "Varning: Överskrid inte 3.3V på TX/RX pinnarna!"
#define TR_FUNC "Funktion"
#define TR_V1 "Värde 1"
#define TR_V2 "Värde 2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/tw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@
#define TR_COPROC "CoProc."
#define TR_COPROC_TEMP "主板溫度"
#define TR_TEMPWARNING INDENT "過熱"
#define TR_TTL_WARNING "注意串口使用逻辑电平3.3V"
#define TR_TTL_WARNING "警告: TX和RX引腳電平不能超過3.3V !"
#define TR_FUNC "功能"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down
2 changes: 1 addition & 1 deletion radio/src/translations/ua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@
#define TR_COPROC "Сопроцессор"
#define TR_COPROC_TEMP "MB темп."
#define TR_TEMPWARNING INDENT "Перегрів"
#define TR_TTL_WARNING "Попередження: використовуйте лог. рівні 3.3V"
#define TR_TTL_WARNING "Warning: Do not exceed 3.3V on TX/RX pins!"
#define TR_FUNC "Функція"
#define TR_V1 "V1"
#define TR_V2 "V2"
Expand Down