From 2fb3f0d60b74c1a5d08b41cb5794a43ab2e93654 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 10 Jul 2019 11:34:14 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/model_setup.cpp | 13 +++++++------ radio/src/gui/212x64/model_setup.cpp | 2 +- radio/src/gui/480x272/model_setup.cpp | 2 +- radio/src/gui/gui_common.cpp | 2 +- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 17 files changed, 23 insertions(+), 22 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index c6ab67f32..4f79bf201 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1526,23 +1526,24 @@ void menuModelSetup(event_t event) auto & module = g_model.moduleData[moduleIdx]; if (isModuleTypeR9MNonAccess(module.type)) { - lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); + lcdDrawTextAlignedLeft(y, STR_RFPOWER); if (isModuleR9M_FCC_VARIANT(moduleIdx)) { - module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Lite FCC has only one setting if (isModuleTypeR9MLiteNonPro(module.type)) { // R9M lite FCC has only one power value, so displayed for info only - lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_FCC_POWER_VALUES, module.pxx.power, LEFT); + lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_FCC_POWER_VALUES, 0, LEFT); if (attr) { REPEAT_LAST_CURSOR_MOVE(); } } else { + module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_FCC_POWER_MAX); // Sanitize lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, module.pxx.power, LEFT | attr); - if (attr) + if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_FCC_POWER_MAX); + } } } else if (isModuleTypeR9MLiteNonPro(module.type)) { - module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_LITE_LBT_POWER_MAX); + module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_LITE_LBT_POWER_MAX); // Sanitize lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LITE_LBT_POWER_VALUES, module.pxx.power, LEFT | attr); if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LITE_LBT_POWER_MAX); @@ -1555,7 +1556,7 @@ void menuModelSetup(event_t event) } } else { - module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_LBT_POWER_MAX); + module.pxx.power = min((uint8_t)module.pxx.power, (uint8_t)R9M_LBT_POWER_MAX); // Sanitize lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_LBT_POWER_VALUES, module.pxx.power, LEFT | attr); if (attr) { CHECK_INCDEC_MODELVAR_ZERO(event, module.pxx.power, R9M_LBT_POWER_MAX); diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 24a23867d..8c6aae7a8 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1217,7 +1217,7 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); if (isModuleR9MNonAccess(moduleIdx)) { - lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER); + lcdDrawTextAlignedLeft(y, TR_RFPOWER); if (isModuleR9M_FCC_VARIANT(moduleIdx)) { lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); if (attr) diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index ea3004ed4..a7adef79d 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -1605,7 +1605,7 @@ bool menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); if (isModuleR9MNonAccess(moduleIdx)) { - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MULTI_RFPOWER); + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RFPOWER); if(isModuleR9M_FCC_VARIANT(moduleIdx)) { lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr); if (attr) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 0b0e3f050..4411f750f 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -820,7 +820,7 @@ const mm_protocol_definition multi_protocols[] = { {MODULE_SUBTYPE_MULTI_FY326, 1, false, STR_SUBTYPE_FY326, nullptr}, {MODULE_SUBTYPE_MULTI_SFHSS, 0, true, NO_SUBTYPE, STR_MULTI_RFTUNE}, {MODULE_SUBTYPE_MULTI_HONTAI, 3, false, STR_SUBTYPE_HONTAI, nullptr}, - {MODULE_SUBTYPE_MULTI_OLRS, 0, false, NO_SUBTYPE, STR_MULTI_RFPOWER}, + {MODULE_SUBTYPE_MULTI_OLRS, 0, false, NO_SUBTYPE, STR_RFPOWER}, {MODULE_SUBTYPE_MULTI_FS_AFHDS2A, 3, true, STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ}, {MODULE_SUBTYPE_MULTI_Q2X2, 2, false, STR_SUBTYPE_Q2X2, nullptr}, {MODULE_SUBTYPE_MULTI_WK_2X01, 5, false, STR_SUBTYPE_WK2x01, nullptr}, diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 576dd101e..8110c2e81 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -521,7 +521,7 @@ const char STR_ADDMAINVIEW[] = TR_ADDMAINVIEW; const char STR_BACKGROUND_COLOR[] = TR_BACKGROUND_COLOR; const char STR_MAIN_COLOR[] = TR_MAIN_COLOR; const char STR_TEXT_VIEWER[] = TR_TEXT_VIEWER; -const char STR_MULTI_RFPOWER[] = TR_MULTI_RFPOWER; +const char STR_RFPOWER[] = TR_RFPOWER; const char STR_BYTES[] = TR_BYTES; const char STR_ANTENNAPROBLEM[] = TR_ANTENNAPROBLEM; const char STR_MODULE[] = TR_MODULE; diff --git a/radio/src/translations.h b/radio/src/translations.h index 0ef7e9758..7ce699069 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -778,7 +778,7 @@ extern const char STR_ADDMAINVIEW[]; extern const char STR_BACKGROUND_COLOR[]; extern const char STR_MAIN_COLOR[]; extern const char STR_TEXT_VIEWER[]; -extern const char STR_MULTI_RFPOWER[]; +extern const char STR_RFPOWER[]; extern const char STR_BYTES[]; extern const char STR_ANTENNAPROBLEM[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index f6bb11689..7d8b129d7 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -697,7 +697,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Ladění frek", INDENT "Jemné ladění frek. RF") #define TR_MULTI_TELEMETRY "Telemetrie" #define TR_MULTI_VIDFREQ TR(INDENT "Freq. videa", INDENT "Frekvence videa") -#define TR_MULTI_RFPOWER INDENT "Výkon RF" +#define TR_RFPOWER INDENT "Výkon RF" #define TR_MULTI_OPTION TR(INDENT "Možnosti", INDENT "Hodnota") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind při zapnutí") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetekce", INDENT "Formát autodetekce") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7c236fd7e..3375660ae 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -708,7 +708,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "RF Freq.", INDENT "RF Freq. Feintuning") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. Freq.", INDENT "Video Frequenz") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Optionswert") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 69663702b..75cce82a3 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -699,7 +699,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index aae3c7d5f..01eba5457 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -723,7 +723,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index fbed2a6d8..8e17d59f4 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -716,7 +716,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 30f6ebbe0..7bc1e9b27 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -719,7 +719,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Ajust.fréq", INDENT "Ajustement fréq.") #define TR_MULTI_TELEMETRY "Télémétrie" #define TR_MULTI_VIDFREQ TR(INDENT "Fréq. vidéo", INDENT "Fréquence vidéo") -#define TR_MULTI_RFPOWER TR(INDENT "Puiss. RF", INDENT "Puissance RF") +#define TR_RFPOWER TR(INDENT "Puiss. RF", INDENT "Puissance RF") #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option perso") #define TR_MULTI_AUTOBIND TR(INDENT "Bind auto", INDENT "Bind automatique") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodét.", INDENT "Autodétection") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 52b0ce3d1..29cf878c2 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -717,7 +717,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 138d9471f..8b1f8ffc5 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -706,7 +706,7 @@ TR_GYR_VSRCRAW #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 9d94cb53f..33b3e4927 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -717,7 +717,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 3ec15cc2d..edcc4124f 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -708,7 +708,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index f413000e8..3819569e2 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -717,7 +717,7 @@ #define TR_MULTI_RFTUNE TR(INDENT "Freq tune",INDENT "RF Freq. fine tune") #define TR_MULTI_TELEMETRY "Telemetry" #define TR_MULTI_VIDFREQ TR(INDENT "Vid. freq.", INDENT "Video frequency") -#define TR_MULTI_RFPOWER INDENT "RF Power" +#define TR_RFPOWER INDENT "RF Power" #define TR_MULTI_OPTION TR(INDENT "Option", INDENT "Option value") #define TR_MULTI_AUTOBIND TR(INDENT "Autobind",INDENT "Bind on powerup") #define TR_MULTI_DSM_AUTODTECT TR(INDENT "Autodetect", INDENT "Autodetect format")