From 1a77d1ffda953bbc478332626c8e31a98cfea329 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 25 Jun 2016 14:11:22 +0200 Subject: [PATCH] 3djc/horus chan mon fix mixers limits (#3626) * Review Channel monitor to handle mixers outside -100/100 Percentage values are now displayed on bar, for both mix and out * Cosmetics (uncrustify) * Channels monitor bars color and background now theme driven * Add TEXT_STATUSBAR_COLOR (was ToDo) Rename for consistency * Replace text by graphic caption * Cosmetics * Remove unwanted vertical line on chanVal * Tidy up code a little * Tidy up * Change green bar to grey Introduce a space between outputs and mixers bar * Partial cosmetics * Fix bad copy/paste --- .../THEMES/Default/mask_monitor_outL.png | Bin 295 -> 0 bytes .../THEMES/Default/mask_monitor_outR.png | Bin 299 -> 0 bytes radio/src/gui/horus/colors.h | 9 +++ radio/src/gui/horus/themes/darkblue.cpp | 4 + radio/src/gui/horus/themes/default.cpp | 4 + radio/src/gui/horus/view_channels.cpp | 76 +++++++++--------- radio/src/gui/horus/widgets.cpp | 2 +- radio/src/translations.cpp | 3 +- radio/src/translations.h | 3 +- radio/src/translations/cz.h.txt | 3 +- radio/src/translations/de.h.txt | 3 +- radio/src/translations/en.h.txt | 3 +- radio/src/translations/es.h.txt | 3 +- radio/src/translations/fi.h.txt | 3 +- radio/src/translations/fr.h.txt | 3 +- radio/src/translations/it.h.txt | 3 +- radio/src/translations/nl.h.txt | 3 +- radio/src/translations/pl.h.txt | 3 +- radio/src/translations/pt.h.txt | 3 +- radio/src/translations/se.h.txt | 3 +- 20 files changed, 82 insertions(+), 52 deletions(-) delete mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png delete mode 100644 radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outL.png deleted file mode 100644 index 78b54ffe92740659a4e0bacf1f4a57367ffd905e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEC#B- z4#JF18nY{af|4b!5hcO-X(i=}MX3zs<>h*rdD+Fui3O>8`9DnXLE~Q7X*EFm6-b;APz2@?*AI)1BpK}HFJ?7eeJ2j$= zHU3i6;we>sY|eXV3YI^Z@!m zQzI{Zw|!o@>AiJm=tUD=!(-f&f`UX?6bP0l+XkKl~HhV diff --git a/radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png b/radio/sdcard/horus/THEMES/Default/mask_monitor_outR.png deleted file mode 100644 index ec8a743c50f611f02ee2b60ca70d9046422282f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VEX7WqAsj$Z!;#Vfk}U9uEC#B- z4#JF18nY{af|4b!5hcO-X(i=}MX3zs<>h*rdD+Fui3O>8`9_+a-KeiL$26kqR( zoA739FT|KfGoYqsXw-(^@>^4h*Cxy=jcW(H4JKbLh*2~7Zv`DyL| diff --git a/radio/src/gui/horus/colors.h b/radio/src/gui/horus/colors.h index 9f46da071..0a4611143 100644 --- a/radio/src/gui/horus/colors.h +++ b/radio/src/gui/horus/colors.h @@ -39,6 +39,7 @@ #define LIGHTGREY RGB(180, 180, 180) #define RED RGB(229, 32, 30) #define DARKRED RGB(160, 0, 6) +#define GREEN RGB(25, 150, 50) #define OPACITY_MAX 0x0F #define OPACITY(x) ((x)<<24) @@ -49,6 +50,7 @@ enum LcdColorIndex TEXT_BGCOLOR_INDEX, TEXT_INVERTED_COLOR_INDEX, TEXT_INVERTED_BGCOLOR_INDEX, + TEXT_STATUSBAR_COLOR_INDEX, LINE_COLOR_INDEX, SCROLLBOX_COLOR_INDEX, MENU_TITLE_BGCOLOR_INDEX, @@ -71,6 +73,9 @@ enum LcdColorIndex MAINVIEW_GRAPHICS_COLOR_INDEX, OVERLAY_COLOR_INDEX, CUSTOM_COLOR_INDEX, + BARGRAPH1_COLOR_INDEX, + BARGRAPH2_COLOR_INDEX, + BARGRAPH_BGCOLOR_INDEX, LCD_COLOR_COUNT }; @@ -83,6 +88,7 @@ extern uint16_t lcdColorTable[LCD_COLOR_COUNT]; #define TEXT_BGCOLOR COLOR(TEXT_BGCOLOR_INDEX) #define TEXT_INVERTED_COLOR COLOR(TEXT_INVERTED_COLOR_INDEX) #define TEXT_INVERTED_BGCOLOR COLOR(TEXT_INVERTED_BGCOLOR_INDEX) +#define TEXT_STATUSBAR_COLOR COLOR(TEXT_STATUSBAR_COLOR_INDEX) #define LINE_COLOR COLOR(LINE_COLOR_INDEX) #define SCROLLBOX_COLOR COLOR(SCROLLBOX_COLOR_INDEX) #define HEADER_SEPARATOR_COLOR COLOR(HEADER_SEPARATOR_COLOR_INDEX) @@ -105,6 +111,9 @@ extern uint16_t lcdColorTable[LCD_COLOR_COUNT]; #define MAINVIEW_PANES_COLOR COLOR(MAINVIEW_PANES_COLOR_INDEX) #define MAINVIEW_GRAPHICS_COLOR COLOR(MAINVIEW_GRAPHICS_COLOR_INDEX) #define OVERLAY_COLOR COLOR(OVERLAY_COLOR_INDEX) +#define BARGRAPH1_COLOR COLOR(BARGRAPH1_COLOR_INDEX) +#define BARGRAPH2_COLOR COLOR(BARGRAPH2_COLOR_INDEX) +#define BARGRAPH_BGCOLOR COLOR(BARGRAPH_BGCOLOR_INDEX) #define CUSTOM_COLOR COLOR(CUSTOM_COLOR_INDEX) #define ARGB_SPLIT(color, a, r, g, b) \ diff --git a/radio/src/gui/horus/themes/darkblue.cpp b/radio/src/gui/horus/themes/darkblue.cpp index 16edca76e..d1c60fa48 100644 --- a/radio/src/gui/horus/themes/darkblue.cpp +++ b/radio/src/gui/horus/themes/darkblue.cpp @@ -34,6 +34,7 @@ class DarkblueTheme: public Theme lcdColorTable[TEXT_BGCOLOR_INDEX] = RGB(10, 78, 121); lcdColorTable[TEXT_INVERTED_COLOR_INDEX] = WHITE; lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = RGB(32, 34, 42); + lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE; lcdColorTable[LINE_COLOR_INDEX] = GREY; lcdColorTable[SCROLLBOX_COLOR_INDEX] = WHITE; lcdColorTable[MENU_TITLE_BGCOLOR_INDEX] = DARKGREY; @@ -55,6 +56,9 @@ class DarkblueTheme: public Theme lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = BLACK; lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RGB(10, 78, 121); lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK; + lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED; + lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167); + lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222); } void loadMenuIcon(uint8_t index, const char * filename) const diff --git a/radio/src/gui/horus/themes/default.cpp b/radio/src/gui/horus/themes/default.cpp index b00e82fb1..332243281 100644 --- a/radio/src/gui/horus/themes/default.cpp +++ b/radio/src/gui/horus/themes/default.cpp @@ -41,6 +41,7 @@ class DefaultTheme: public Theme lcdColorTable[TEXT_BGCOLOR_INDEX] = WHITE; lcdColorTable[TEXT_INVERTED_COLOR_INDEX] = WHITE; lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX] = RED; + lcdColorTable[TEXT_STATUSBAR_COLOR_INDEX] = WHITE; lcdColorTable[LINE_COLOR_INDEX] = GREY; lcdColorTable[SCROLLBOX_COLOR_INDEX] = RED; lcdColorTable[MENU_TITLE_BGCOLOR_INDEX] = DARKGREY; @@ -62,6 +63,9 @@ class DefaultTheme: public Theme lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = RED; lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RED; lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK; + lcdColorTable[BARGRAPH1_COLOR_INDEX] = RED; + lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(167, 167, 167); + lcdColorTable[BARGRAPH_BGCOLOR_INDEX] = RGB(222, 222, 222); } void loadMenuIcon(uint8_t index, const char * filename, uint32_t color=MENU_TITLE_COLOR) const diff --git a/radio/src/gui/horus/view_channels.cpp b/radio/src/gui/horus/view_channels.cpp index 8c2b1e2fe..39c6a59de 100644 --- a/radio/src/gui/horus/view_channels.cpp +++ b/radio/src/gui/horus/view_channels.cpp @@ -22,12 +22,13 @@ #define RECT_OFFSET 80 #define ROW_HEIGHT 42 -#define BAR_HEIGHT 14 +#define BAR_HEIGHT 13 #define COLUMN_SIZE 200 #define X_OFFSET 25 #define Y_OFFSET 75 #define Y_OUTBAR 15 #define Y_MIXBAR 28 +#define LEG_COLORBOX 15 bool menuChannelsMonitor(evt_t event, uint8_t page); bool menuLogicalSwitches(evt_t); @@ -58,21 +59,23 @@ uint16_t posOnBar(int16_t value_to100) void drawSingleMixerBar(coord_t x, coord_t y, uint8_t chan) { + char chanString[] = "-500%"; int16_t chanVal = calcRESXto100(ex_chans[chan]); + int16_t displayVal = chanVal; - lcdColorTable[CUSTOM_COLOR_INDEX] = RGB(222, 222, 222); - lcdDrawSolidFilledRect(x, y, COLUMN_SIZE, BAR_HEIGHT, CUSTOM_COLOR); + chanVal = limit(-100, chanVal, 100); + strAppend(strAppendSigned(chanString, displayVal), "%"); - lcd->drawSolidVerticalLine(x + posOnBar(chanVal), y, BAR_HEIGHT, HEADER_BGCOLOR); - - lcdColorTable[CUSTOM_COLOR_INDEX] = RGB(25, 150, 50); + lcdDrawSolidFilledRect(x, y, COLUMN_SIZE, BAR_HEIGHT, BARGRAPH_BGCOLOR); if (chanVal > 0) { - lcdDrawSolidFilledRect(x + COLUMN_SIZE / 2, y, divRoundClosest(chanVal * COLUMN_SIZE, 200), BAR_HEIGHT, CUSTOM_COLOR); + lcdDrawSolidFilledRect(x + COLUMN_SIZE / 2, y, divRoundClosest(chanVal * COLUMN_SIZE, 200), BAR_HEIGHT, BARGRAPH2_COLOR); + lcdDrawText(x - 10 + COLUMN_SIZE / 2, y, chanString, SMLSIZE | TEXT_COLOR | RIGHT); } else if (chanVal < 0) { uint16_t endpoint = x + COLUMN_SIZE / 2; uint16_t size = divRoundClosest(-chanVal * COLUMN_SIZE, 200); - lcdDrawSolidFilledRect(endpoint - size, y, size, BAR_HEIGHT, CUSTOM_COLOR); + lcdDrawSolidFilledRect(endpoint - size, y, size, BAR_HEIGHT, BARGRAPH2_COLOR); + lcdDrawText(x + 10 + COLUMN_SIZE / 2, y, chanString, SMLSIZE | TEXT_COLOR); } lcd->drawSolidVerticalLine(x + COLUMN_SIZE / 2, y, BAR_HEIGHT, TEXT_COLOR); @@ -87,8 +90,6 @@ void drawSingleOutputBar(coord_t x, coord_t y, uint8_t channel) static const BitmapBuffer * locked_bmp = BitmapBuffer::load(getThemePath("mask_monitor_lockch.png")); static const BitmapBuffer * inver_bmp = BitmapBuffer::load(getThemePath("mask_monitor_inver.png")); - static const BitmapBuffer * outL_bmp = BitmapBuffer::load(getThemePath("mask_monitor_outL.png")); - static const BitmapBuffer * outR_bmp = BitmapBuffer::load(getThemePath("mask_monitor_outR.png")); strAppendSigned(&chanString[2], channel + 1, 2); lcdDrawText(x, y, chanString, SMLSIZE | TEXT_COLOR | LEFT); @@ -98,62 +99,61 @@ void drawSingleOutputBar(coord_t x, coord_t y, uint8_t channel) strAppendSigned(chanString, usValue); if (usValue < 1000) strAppend(&chanString[3], STR_US); else strAppend(&chanString[4], STR_US); - lcdDrawText(x + 155, y, chanString, SMLSIZE | TEXT_COLOR | RIGHT); + lcdDrawText(x + COLUMN_SIZE, y, chanString, SMLSIZE | TEXT_COLOR | RIGHT); - lcdColorTable[CUSTOM_COLOR_INDEX] = RGB(222, 222, 222); - lcdDrawSolidFilledRect(x, y + Y_OUTBAR, COLUMN_SIZE, BAR_HEIGHT, CUSTOM_COLOR); + lcdDrawSolidFilledRect(x, y + Y_OUTBAR, COLUMN_SIZE, BAR_HEIGHT, BARGRAPH_BGCOLOR); lcdDrawText(x + posOnBar(-100 + ld->min / 10) + 2, y + Y_OUTBAR, "]", TINSIZE | TEXT_COLOR | RIGHT); lcdDrawText(x + posOnBar(100 + ld->max / 10), y + Y_OUTBAR, "[", TINSIZE | TEXT_COLOR); lcd->drawSolidVerticalLine(x + posOnBar(calcRESXto100(ld->offset)), y + Y_OUTBAR, BAR_HEIGHT, MAINVIEW_GRAPHICS_COLOR); - lcd->drawSolidVerticalLine(x + posOnBar(chanVal), y + Y_OUTBAR, BAR_HEIGHT, HEADER_BGCOLOR); - strAppendSigned(chanString, chanVal); - if (chanVal < -limits / 2) { - chanVal = -limits / 2; - lcdDrawText(x + COLUMN_SIZE - 2, y + 1, chanString, SMLSIZE | TEXT_COLOR | RIGHT | INVERS); - lcd->drawBitmap(x + COLUMN_SIZE / 2 + 5, y + 16, outL_bmp); - } - else if (chanVal > limits / 2) { - chanVal = limits / 2; - lcdDrawText(x + COLUMN_SIZE - 2, y + 1, chanString, SMLSIZE | TEXT_COLOR | RIGHT | INVERS); - lcd->drawBitmap(x + COLUMN_SIZE / 2 - 5, y + 16, outR_bmp); - } - else { - lcdDrawText(x + COLUMN_SIZE - 2, y + 1, chanString, SMLSIZE | TEXT_COLOR | RIGHT); - } + strAppend(strAppendSigned(chanString, chanVal), "%"); + if (chanVal > 0) lcdDrawText(x - 10 + COLUMN_SIZE / 2, y + BAR_HEIGHT, chanString, SMLSIZE | TEXT_COLOR | RIGHT); + else lcdDrawText(x + 10 + COLUMN_SIZE / 2, y + BAR_HEIGHT, chanString, SMLSIZE | TEXT_COLOR); - lcdColorTable[CUSTOM_COLOR_INDEX] = RED; + if (chanVal < -limits / 2) chanVal = -limits / 2; + else if (chanVal > limits / 2) chanVal = limits / 2; if (posOnBar(chanVal) > posOnBar(calcRESXto100(ld->offset))) { - lcdDrawSolidFilledRect(x + posOnBar(calcRESXto100(ld->offset)), y + Y_OUTBAR, posOnBar(chanVal) - posOnBar(calcRESXto100(ld->offset)), BAR_HEIGHT, CUSTOM_COLOR); + lcdDrawSolidFilledRect(x + posOnBar(calcRESXto100(ld->offset)), y + Y_OUTBAR, posOnBar(chanVal) - posOnBar(calcRESXto100(ld->offset)), BAR_HEIGHT, BARGRAPH1_COLOR); } else if (posOnBar(chanVal) < posOnBar(calcRESXto100(ld->offset))) { uint16_t endpoint = x + posOnBar(calcRESXto100(ld->offset)); uint16_t size = posOnBar(calcRESXto100(ld->offset)) - posOnBar(chanVal); - lcdDrawSolidFilledRect(endpoint - size, y + Y_OUTBAR, size, BAR_HEIGHT, CUSTOM_COLOR); + lcdDrawSolidFilledRect(endpoint - size, y + Y_OUTBAR, size, BAR_HEIGHT, BARGRAPH1_COLOR); } - if (safetyCh[channel] != OVERRIDE_CHANNEL_UNDEFINED) lcd->drawBitmap(x -X_OFFSET + 7, y + 7, locked_bmp); - if (ld->revert) lcd->drawBitmap(x -X_OFFSET + 7, y + 25, inver_bmp); + if (safetyCh[channel] != OVERRIDE_CHANNEL_UNDEFINED) lcd->drawBitmap(x - X_OFFSET + 7, y + 7, locked_bmp); + if (ld->revert) lcd->drawBitmap(x - X_OFFSET + 7, y + 25, inver_bmp); lcd->drawSolidVerticalLine(x + COLUMN_SIZE / 2, y + Y_OUTBAR, BAR_HEIGHT, TEXT_COLOR); } +coord_t drawChannelsMonitorLegend(coord_t x, const pm_char * s, int color) +{ + lcdDrawSolidFilledRect(x, MENU_FOOTER_TOP + 2, LEG_COLORBOX + 2, LEG_COLORBOX + 2, BARGRAPH_BGCOLOR); + lcdDrawSolidFilledRect(x + 1, MENU_FOOTER_TOP + 3, LEG_COLORBOX, LEG_COLORBOX, color); + lcdDrawText(x + 20, MENU_FOOTER_TOP, s, TEXT_STATUSBAR_COLOR); + return x + 25 + getTextWidth(s); +} + bool menuChannelsMonitor(evt_t event, uint8_t page) { uint8_t channel = 8 * page; - coord_t x = X_OFFSET, y = Y_OFFSET; - - drawStatusText(STR_MONITOR_CHANNELS_DESC); + coord_t x, y = Y_OFFSET; + + x = drawChannelsMonitorLegend(MENUS_MARGIN_LEFT, STR_MONITOR_OUTPUT_DESC, BARGRAPH1_COLOR); + drawChannelsMonitorLegend(x, STR_MONITOR_MIXER_DESC, BARGRAPH2_COLOR); + + x = X_OFFSET; for (uint8_t i = 0; i < 4; i++, channel++, y += ROW_HEIGHT) { drawSingleOutputBar(x, y, channel); - drawSingleMixerBar(x, y + Y_MIXBAR, channel); + drawSingleMixerBar(x, y + Y_MIXBAR + 1, channel); } x = 1 + LCD_W / 2 + X_OFFSET; y = Y_OFFSET; for (uint8_t i = 0; i < 4; i++, channel++, y += ROW_HEIGHT) { drawSingleOutputBar(x, y, channel); - drawSingleMixerBar(x, y + Y_MIXBAR, channel); + drawSingleMixerBar(x, y + Y_MIXBAR + 1, channel); } return true; } diff --git a/radio/src/gui/horus/widgets.cpp b/radio/src/gui/horus/widgets.cpp index 49e01f2f9..b2f952afb 100644 --- a/radio/src/gui/horus/widgets.cpp +++ b/radio/src/gui/horus/widgets.cpp @@ -23,7 +23,7 @@ void drawStatusText(const char * text) { - lcdDrawText(MENUS_MARGIN_LEFT, MENU_FOOTER_TOP, text, MENU_TITLE_COLOR); // TODO dedicated theme color + lcdDrawText(MENUS_MARGIN_LEFT, MENU_FOOTER_TOP, text, TEXT_STATUSBAR_COLOR); } void drawColumnHeader(const char * const * headers, const char * const * descriptions, uint8_t index) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 37c47a551..648a38de0 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -367,7 +367,8 @@ const pm_char STR_MENUSTAT[] PROGMEM = TR_MENUSTAT; const pm_char STR_MENUDEBUG[] PROGMEM = TR_MENUDEBUG; const char * const STR_MONITOR_CHANNELS[] = { TR_MONITOR_CHANNELS1, TR_MONITOR_CHANNELS2, TR_MONITOR_CHANNELS3, TR_MONITOR_CHANNELS4 }; const pm_char STR_MONITOR_SWITCHES[] PROGMEM = TR_MONITOR_SWITCHES; -const pm_char STR_MONITOR_CHANNELS_DESC[] PROGMEM = TR_MONITOR_CHANNELS_DESC; +const pm_char STR_MONITOR_OUTPUT_DESC[] PROGMEM = TR_MONITOR_OUTPUT_DESC; +const pm_char STR_MONITOR_MIXER_DESC[] PROGMEM = TR_MONITOR_MIXER_DESC; const pm_char STR_MENUGLOBALVARS[] PROGMEM = TR_MENUGLOBALVARS; #if defined(DSM2) || defined(PXX) diff --git a/radio/src/translations.h b/radio/src/translations.h index e8b6fb07b..525a3a31a 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -568,7 +568,8 @@ extern const pm_char STR_MENUSTAT[]; extern const pm_char STR_MENUDEBUG[]; extern const char * const STR_MONITOR_CHANNELS[]; extern const pm_char STR_MONITOR_SWITCHES[]; -extern const pm_char STR_MONITOR_CHANNELS_DESC[]; +extern const pm_char STR_MONITOR_OUTPUT_DESC[]; +extern const pm_char STR_MONITOR_MIXER_DESC[]; extern const pm_char STR_MENUGLOBALVARS[]; extern const pm_char STR_INVERT_THR[]; extern const pm_char STR_AND_SWITCH[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index eea27f28a..4a99d86e9 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -852,7 +852,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "RX číslo", INDENT "Číslo přijímače") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a35c2660d..d1c6bb492 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -856,7 +856,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "Empf Nr.", INDENT "Modell-Match-Nr.") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 705b30bd7..389fc471d 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -870,7 +870,8 @@ #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17-24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25-32" #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 6abae21eb..caf3ec93f 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -820,7 +820,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #define TR_RECEIVER_NUM TR("RxNum", INDENT"Receptor No.") #define TR_RECEIVER INDENT "Receiver" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 3eb4965cc..27351d721 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -820,7 +820,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #define TR_RECEIVER_NUM TR("RxNum", INDENT"Receiver No.") #define TR_RECEIVER INDENT "Receiver" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index e5cdee870..ee80db8f7 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -847,7 +847,8 @@ #define TR_MONITOR_CHANNELS3 "VOIES 17-24" #define TR_MONITOR_CHANNELS4 "VOIES 25-32" #define TR_MONITOR_SWITCHES "INTERS LOGIQUES" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "NumRx", INDENT "No. récepteur") #define TR_RECEIVER INDENT "Récepteur" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a6d114a30..4efd5fe22 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -851,7 +851,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Ricevente No.") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 99ef2bd3a..ff81764eb 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -865,7 +865,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 6c3af3595..7586390f2 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -853,7 +853,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR( INDENT "Nr RX",INDENT "Nr odbiornika") #define TR_RECEIVER INDENT "Receiver" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 2b31ae375..34a7d5bed 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -816,7 +816,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #define TR_RECEIVER_NUM "RxNum" #define TR_RECEIVER INDENT "Receiver" #define TR_SYNCMENU "Sync [MENU]" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b199d8c25..963c1d8ab 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -864,7 +864,8 @@ #define TR_MONITOR_SWITCHES "LOGICAL SWITCHES MONITOR" #define TR_MONITOR_CHANNELS3 "CHANNELS MONITOR 17/24" #define TR_MONITOR_CHANNELS4 "CHANNELS MONITOR 25/32" -#define TR_MONITOR_CHANNELS_DESC "RED : Outputs, GREEN : Mixers" +#define TR_MONITOR_OUTPUT_DESC "Outputs" +#define TR_MONITOR_MIXER_DESC "Mixers" #if defined(CPUARM) #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Mottagare Nr.") #define TR_RECEIVER INDENT "Receiver"