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

EdgeTX · Mar 22, 2024 · ed85886 · ed85886
1 parent 7a96dd8
commit ed85886
Show file tree

Hide file tree

Showing 31 changed files with 36,285 additions and 36,333 deletions.
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_13.c b/radio/src/fonts/lvgl/lv_font_noto_jp_13.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_16.c b/radio/src/fonts/lvgl/lv_font_noto_jp_16.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_24.c b/radio/src/fonts/lvgl/lv_font_noto_jp_24.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_9.c b/radio/src/fonts/lvgl/lv_font_noto_jp_9.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_bold_16.c b/radio/src/fonts/lvgl/lv_font_noto_jp_bold_16.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_jp_bold_32.c b/radio/src/fonts/lvgl/lv_font_noto_jp_bold_32.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_13.c b/radio/src/fonts/lvgl/lv_font_noto_tw_13.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_16.c b/radio/src/fonts/lvgl/lv_font_noto_tw_16.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_24.c b/radio/src/fonts/lvgl/lv_font_noto_tw_24.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_9.c b/radio/src/fonts/lvgl/lv_font_noto_tw_9.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_bold_16.c b/radio/src/fonts/lvgl/lv_font_noto_tw_bold_16.c
diff --git a/radio/src/fonts/lvgl/lv_font_noto_tw_bold_32.c b/radio/src/fonts/lvgl/lv_font_noto_tw_bold_32.c
diff --git a/radio/src/gui/colorlcd/hw_serial.cpp b/radio/src/gui/colorlcd/hw_serial.cpp
@@ -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);
 
@@ -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);
+    }
   }
 }
diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h
@@ -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"

diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h
@@ -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"

diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h
@@ -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")

diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h
@@ -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"

diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h
@@ -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"

diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h
@@ -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"

diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h
@@ -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"

diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h
@@ -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"

diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h
@@ -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"

diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h
@@ -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"

diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h
@@ -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"

diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h
@@ -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"

diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h
@@ -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"

diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h
@@ -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"

diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h
@@ -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"

diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h
@@ -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"

diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
@@ -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"

diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h
@@ -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"