From 3b2e1a61e777630b942efea9b2c23fc9a3d22a5f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 15 Nov 2019 13:08:00 +0100 Subject: [PATCH] Fixes #5256 --- radio/src/gui/128x64/model_inputs_mixes.cpp | 8 ++++---- radio/src/gui/128x64/model_mix_edit.cpp | 4 ++-- radio/src/gui/212x64/model_mix_edit.cpp | 4 ++-- radio/src/gui/480x272/model_mixes.cpp | 4 ++-- radio/src/gui/common/stdlcd/model_mixes.cpp | 6 +++--- radio/src/translations.cpp | 2 +- radio/src/translations/en.h.txt | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/radio/src/gui/128x64/model_inputs_mixes.cpp b/radio/src/gui/128x64/model_inputs_mixes.cpp index 7a49d67c2..03bdfb411 100644 --- a/radio/src/gui/128x64/model_inputs_mixes.cpp +++ b/radio/src/gui/128x64/model_inputs_mixes.cpp @@ -378,7 +378,7 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md) void menuModelMixOne(event_t event) { - title(STR_MIXER); + title(STR_MIXES); MixData * md2 = mixAddress(s_currIdx) ; putsChn(lcdLastRightPos+1*FW, 0, md2->destCh+1,0); @@ -731,10 +731,10 @@ void menuModelExpoMix(uint8_t expo, event_t event) break; } - lcdDrawNumber(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, getExpoMixCount(expo)); - lcdDrawText(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS)); + lcdDrawNumber(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXES))+FW+FW/2, 0, getExpoMixCount(expo)); + lcdDrawText(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXES))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS)); - SIMPLE_MENU(expo ? STR_MENUINPUTS : STR_MIXER, menuTabModel, expo ? MENU_MODEL_INPUTS : MENU_MODEL_MIXES, s_maxLines); + SIMPLE_MENU(expo ? STR_MENUINPUTS : STR_MIXES, menuTabModel, expo ? MENU_MODEL_INPUTS : MENU_MODEL_MIXES, s_maxLines); sub = menuVerticalPosition; s_currCh = 0; diff --git a/radio/src/gui/128x64/model_mix_edit.cpp b/radio/src/gui/128x64/model_mix_edit.cpp index 2a87faa7d..785d8a989 100644 --- a/radio/src/gui/128x64/model_mix_edit.cpp +++ b/radio/src/gui/128x64/model_mix_edit.cpp @@ -86,9 +86,9 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md) void menuModelMixOne(event_t event) { MixData * md2 = mixAddress(s_currIdx) ; - putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); + putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0); - SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); + SUBMENU(STR_MIXES, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); int8_t sub = menuVerticalPosition; int8_t editMode = s_editMode; diff --git a/radio/src/gui/212x64/model_mix_edit.cpp b/radio/src/gui/212x64/model_mix_edit.cpp index 1d0dcf9eb..1faec6d69 100644 --- a/radio/src/gui/212x64/model_mix_edit.cpp +++ b/radio/src/gui/212x64/model_mix_edit.cpp @@ -91,10 +91,10 @@ void menuModelMixOne(event_t event) } MixData * md2 = mixAddress(s_currIdx) ; - putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); + putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0); lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); - SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); + SUBMENU(STR_MIXES, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); int8_t sub = menuVerticalPosition; int8_t editMode = s_editMode; diff --git a/radio/src/gui/480x272/model_mixes.cpp b/radio/src/gui/480x272/model_mixes.cpp index 1502b99ec..0f98dc9d9 100644 --- a/radio/src/gui/480x272/model_mixes.cpp +++ b/radio/src/gui/480x272/model_mixes.cpp @@ -176,7 +176,7 @@ bool menuModelMixOne(event_t event) { MixData * md2 = mixAddress(s_currIdx) ; - SUBMENU_WITH_OPTIONS(STR_MIXER, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ }); + SUBMENU_WITH_OPTIONS(STR_MIXES, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ }); putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR); displayMixStatus(md2->destCh); @@ -413,7 +413,7 @@ bool menuModelMixAll(event_t event) uint8_t chn = mixAddress(s_currIdx)->destCh + 1; int linesCount = getMixesLinesCount(); - SIMPLE_MENU(STR_MIXER, MODEL_ICONS, menuTabModel, MENU_MODEL_MIXES, linesCount); + SIMPLE_MENU(STR_MIXES, MODEL_ICONS, menuTabModel, MENU_MODEL_MIXES, linesCount); switch (event) { case EVT_ENTRY: diff --git a/radio/src/gui/common/stdlcd/model_mixes.cpp b/radio/src/gui/common/stdlcd/model_mixes.cpp index 2a4849d6f..c2714a3b0 100644 --- a/radio/src/gui/common/stdlcd/model_mixes.cpp +++ b/radio/src/gui/common/stdlcd/model_mixes.cpp @@ -231,7 +231,7 @@ void displayMixInfos(coord_t y, MixData * md) void displayMixLine(coord_t y, MixData * md, bool active) { if(active && md->name[0]) { - lcdDrawSizedText(FW*sizeof(TR_MIXER)+FW/2, 0, md->name, sizeof(md->name), ZCHAR); + lcdDrawSizedText(FW*sizeof(TR_MIXES)+FW/2, 0, md->name, sizeof(md->name), ZCHAR); if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1))) displayMixInfos(y, md); else @@ -385,7 +385,7 @@ void menuModelMixAll(event_t event) break; } - lcdDrawNumber(FW*sizeof(TR_MIXER)+FW/2, 0, getMixesCount(), 0); + lcdDrawNumber(FW*sizeof(TR_MIXES)+FW/2, 0, getMixesCount(), 0); lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS)); // Value @@ -397,7 +397,7 @@ void menuModelMixAll(event_t event) #endif } - SIMPLE_MENU(STR_MIXER, menuTabModel, MENU_MODEL_MIXES, HEADER_LINE + s_maxLines); + SIMPLE_MENU(STR_MIXES, menuTabModel, MENU_MODEL_MIXES, HEADER_LINE + s_maxLines); #if LCD_W >= 212 // Gauge diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 585dbda76..ca01833ce 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -146,7 +146,7 @@ const char STR_DELAYDOWN[] = TR_DELAYDOWN; const char STR_DELAYUP[] = TR_DELAYUP; const char STR_SLOWDOWN[] = TR_SLOWDOWN; const char STR_SLOWUP[] = TR_SLOWUP; -const char STR_MIXER[] = TR_MIXER; +const char STR_MIXES[] = TR_MIXES; const char STR_CV[] = TR_CV; const char STR_GV[] = TR_GV; const char STR_RANGE[] = TR_RANGE; diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index c02d67a91..f71c5d5f5 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -480,7 +480,7 @@ #define TR_DELAYUP "Delay up" #define TR_SLOWDOWN "Slow dn" #define TR_SLOWUP "Slow up" -#define TR_MIXER "MIXER" +#define TR_MIXER "MIXES" #define TR_CV "CV" #define TR_GV TR("G", "GV") #define TR_ACHANNEL "A\004channel"