piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(color): channel monitor only shows active channels, page buttons if more pages (#6732)

Browse Source
This commit is contained in:
philmoz
2025-10-30 19:20:07 +10:00
committed by GitHub
parent 7530b3a442
commit 1bf2af9f0d
25 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/mainview/view_channels.cpp
+65 -23
View File
@@ -32,8 +32,7 @@ class ChannelsViewFooter : public Window
{
public:
explicit ChannelsViewFooter(Window* parent) :
Window(parent, {0, parent->height() - LEG_COLORBOX - PAD_SMALL * 2 - 2, LCD_W,
LEG_COLORBOX + PAD_SMALL * 2 + 2})
Window(parent, {0, parent->height() - FOOTER_H, LCD_W, FOOTER_H})
{
etx_solid_bg(lvobj, COLOR_THEME_SECONDARY1_INDEX);
@@ -62,6 +61,7 @@ class ChannelsViewFooter : public Window
static LAYOUT_VAL_SCALED(LEG_COLORBOX, 14)
static LAYOUT_VAL_SCALED(TXT_H, 18)
static constexpr coord_t FOOTER_H = LEG_COLORBOX + PAD_SMALL * 2 + PAD_TINY;
};
//-----------------------------------------------------------------------------
@@ -69,36 +69,45 @@ class ChannelsViewFooter : public Window
class ChannelsViewPage : public PageGroupItem
{
public:
explicit ChannelsViewPage(uint8_t pageIndex = 0) :
PageGroupItem(STR_MONITOR_CHANNELS[pageIndex]),
pageIndex(pageIndex)
explicit ChannelsViewPage(uint8_t startChan, int rows, int cols, const char* title) :
PageGroupItem(title), startChan(startChan), rows(rows), cols(cols)
{
icon = ICON_MONITOR;
}
static constexpr coord_t CHANS_H = 3 * ChannelBar::BAR_HEIGHT + PAD_THREE;
protected:
uint8_t pageIndex = 0;
uint8_t startChan;
int rows;
int cols;
void build(Window* window) override
{
constexpr coord_t hmargin = PAD_SMALL;
window->padAll(PAD_ZERO);
// Channels bars
for (uint8_t chan = pageIndex * 8; chan < 8 + pageIndex * 8; chan++) {
#if PORTRAIT
coord_t width = window->width() - (hmargin * 2);
coord_t xPos = hmargin;
coord_t yPos = (chan % 8) *
((window->height() - PAD_LARGE* 3) / 8);
coord_t w = window->width() - (PAD_SMALL * 2);
#else
coord_t width = window->width() / 2 - (hmargin * 2);
coord_t xPos = (chan % 8) >= 4 ? width + (hmargin * 2) : hmargin;
coord_t yPos = (chan % 4) *
((window->height() - (PAD_LARGE * 3 - 1)) / 4);
coord_t w = window->width() / 2 - (PAD_SMALL * 2);
#endif
new ComboChannelBar(window, {xPos, yPos, width, 3 * ChannelBar::BAR_HEIGHT + PAD_THREE},
chan);
// Channels bars
for (uint8_t i = 0, j = 0; j < rows * cols; i += 1) {
uint8_t chan = startChan + i;
if (chan >= MAX_OUTPUT_CHANNELS) break;
if (isChannelUsed(chan)) {
#if PORTRAIT
coord_t xPos = PAD_SMALL;
coord_t yPos = j * ((window->height() - PAD_LARGE * 3) / rows);
#else
coord_t xPos = (j & 1) ? w + (PAD_SMALL * 2) : PAD_SMALL;
coord_t yPos = (j / cols) * ((window->height() - ChannelsViewFooter::FOOTER_H) / rows);
#endif
new ComboChannelBar(window, {xPos, yPos, w, CHANS_H}, chan);
j += 1;
}
}
// Footer
@@ -113,8 +122,41 @@ ChannelsViewMenu::ChannelsViewMenu() :
{
QuickMenu::setCurrentPage(QuickMenu::TOOLS_CHAN_MON);
addTab(new ChannelsViewPage(0));
addTab(new ChannelsViewPage(1));
addTab(new ChannelsViewPage(2));
addTab(new ChannelsViewPage(3));
#if PORTRAIT
int cols = 1;
int rows = 8;
#else
int cols = 2;
int rows = (LCD_H - EdgeTxStyles::MENU_HEADER_HEIGHT - ChannelsViewFooter::FOOTER_H) / ChannelsViewPage::CHANS_H;
#endif
int pages = 0;
int chansPerPage = rows * cols;
char s[50];
for (int i = 0; i < MAX_OUTPUT_CHANNELS;) {
int start = i;
while (!isChannelUsed(start)) {
start += 1;
if (start >= MAX_OUTPUT_CHANNELS) break;
}
if (start >= MAX_OUTPUT_CHANNELS) break;
int count = 1;
int last = start;
int end = start + 1;
while (end < MAX_OUTPUT_CHANNELS && count < chansPerPage) {
if (isChannelUsed(end)) {
count += 1;
last = end;
}
end += 1;
}
sprintf(s, STR_MONITOR_CHANNELS, start + 1, last + 1);
addTab(new ChannelsViewPage(start, rows, cols, s));
pages += 1;
i = end;
}
if (pages < 2) hidePageButtons();
}
radio/src/gui/colorlcd/setup_menus/pagegroup.cpp
+15 -2
View File
@@ -381,12 +381,12 @@ class TabsGroupHeader : public PageGroupHeaderBase
lv_obj_set_size(titleLabel, LCD_W, TabsGroup::PAGE_ALT_TITLE_H);
#endif
new IconButton(this, ICON_BTN_PREV, LCD_W - PageGroup::PAGE_TOP_BAR_H * 3, PAD_MEDIUM, [=]() {
prevBtn = new IconButton(this, ICON_BTN_PREV, LCD_W - PageGroup::PAGE_TOP_BAR_H * 3, PAD_MEDIUM, [=]() {
prevTab();
return 0;
});
new IconButton(this, ICON_BTN_NEXT, LCD_W - PageGroup::PAGE_TOP_BAR_H * 2, PAD_MEDIUM, [=]() {
nextBtn = new IconButton(this, ICON_BTN_NEXT, LCD_W - PageGroup::PAGE_TOP_BAR_H * 2, PAD_MEDIUM, [=]() {
nextTab();
return 0;
});
@@ -405,7 +405,15 @@ class TabsGroupHeader : public PageGroupHeaderBase
menu->setCurrentTab(idx);
}
void hidePageButtons()
{
if (prevBtn) prevBtn->hide();
if (nextBtn) nextBtn->hide();
}
protected:
IconButton* nextBtn = nullptr;
IconButton* prevBtn = nullptr;
};
//-----------------------------------------------------------------------------
@@ -444,3 +452,8 @@ void TabsGroup::openMenu()
}
}, p, subMenu);
}
void TabsGroup::hidePageButtons()
{
((TabsGroupHeader*)header)->hidePageButtons();
}
radio/src/gui/colorlcd/setup_menus/pagegroup.h
+2
View File
@@ -218,6 +218,8 @@ class TabsGroup : public PageGroupBase
std::string getName() const override { return "TabsGroup"; }
#endif
void hidePageButtons();
static LAYOUT_ORIENTATION_SCALED(PAGE_TOP_BAR_H, 45, 48)
static LAYOUT_ORIENTATION(PAGE_ALT_TITLE_H, 0, EdgeTxStyles::STD_FONT_HEIGHT)
static constexpr coord_t TABS_GROUP_BODY_Y = PAGE_TOP_BAR_H + PAGE_ALT_TITLE_H;
radio/src/gui/gui_common.h
+1
View File
@@ -53,6 +53,7 @@ enum SwitchContext
int getFirstAvailable(int min, int max, IsValueAvailable isValueAvailable);
bool isChannelUsed(int channel);
bool checkSourceAvailable(int source, uint32_t sourceTypes);
bool checkSwitchAvailable(int swtch, uint32_t swtchTypes);
bool isInputAvailable(int input);
radio/src/translations/i18n/cn.h
+1 -4
View File
@@ -664,10 +664,7 @@
#define TR_MENULOGICALSWITCH "逻辑开关"
#define TR_MENUSTAT "统计"
#define TR_MENUDEBUG "Debug"
#define TR_MONITOR_CHANNELS1 "1-8通道查看"
#define TR_MONITOR_CHANNELS2 "9-16通道查看"
#define TR_MONITOR_CHANNELS3 "17-24通道查看"
#define TR_MONITOR_CHANNELS4 "25-32通道查看"
#define TR_MONITOR_CHANNELS "%d-%d通道查看"
#define TR_MONITOR_OUTPUT_DESC "输出查看"
#define TR_MONITOR_MIXER_DESC "混控查看"
#define TR_RECEIVER_NUM TR("RxNum", "接收机编号")
radio/src/translations/i18n/cz.h
+1 -4
View File
@@ -669,10 +669,7 @@
#define TR_MENULOGICALSWITCH "LOG. SPÍNAČ"
#define TR_MENUSTAT "STATISTIKA"
#define TR_MENUDEBUG "DIAG"
#define TR_MONITOR_CHANNELS1 "MONITOR KANÁLŮ 1/8"
#define TR_MONITOR_CHANNELS2 "MONITOR KANÁLŮ 9/16"
#define TR_MONITOR_CHANNELS3 "MONITOR KANÁLŮ 17/24"
#define TR_MONITOR_CHANNELS4 "MONITOR KANÁLŮ 25/32"
#define TR_MONITOR_CHANNELS "MONITOR KANÁLŮ %d/%d"
#define TR_MONITOR_OUTPUT_DESC "Výstupy"
#define TR_MONITOR_MIXER_DESC "Mixy"
#define TR_RECEIVER_NUM TR("RX číslo", "Číslo přijímače")
radio/src/translations/i18n/da.h
+1 -4
View File
@@ -669,10 +669,7 @@
#define TR_MENULOGICALSWITCH "LOGISK FUNKTION"
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "KANAL MONITOR 1-8"
#define TR_MONITOR_CHANNELS2 "KANAL MONITOR 9-16"
#define TR_MONITOR_CHANNELS3 "KANAL MONITOR 17-24"
#define TR_MONITOR_CHANNELS4 "KANAL MONITOR 25-32"
#define TR_MONITOR_CHANNELS "KANAL MONITOR %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Udgange"
#define TR_MONITOR_MIXER_DESC "Mix"
#define TR_RECEIVER_NUM TR("RxNr", "Rx modtager Nr.")
radio/src/translations/i18n/de.h
+1 -4
View File
@@ -665,10 +665,7 @@
#define TR_MENULOGICALSWITCH "LOGIKSCHALTER"
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "KANAL+MISCHER MONITOR 1-8"
#define TR_MONITOR_CHANNELS2 "KANAL+MISCHER MONITOR 9-16"
#define TR_MONITOR_CHANNELS3 "KANAL+MISCHER MONITOR 17-24"
#define TR_MONITOR_CHANNELS4 "KANAL+MISCHER MONITOR 25-32"
#define TR_MONITOR_CHANNELS "KANAL+MISCHER MONITOR %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Kanäle"
#define TR_MONITOR_MIXER_DESC "Mischer"
#define TR_RECEIVER_NUM TR("Empf Nr.", "Empfänger Nummer")
radio/src/translations/i18n/en.h
+1 -4
View File
@@ -665,10 +665,7 @@
#define TR_MENULOGICALSWITCH "LOGICAL SWITCH"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "CHANNELS 1-8"
#define TR_MONITOR_CHANNELS2 "CHANNELS 9-16"
#define TR_MONITOR_CHANNELS3 "CHANNELS 17-24"
#define TR_MONITOR_CHANNELS4 "CHANNELS 25-32"
#define TR_MONITOR_CHANNELS "CHANNELS %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Outputs"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("RxNum", "Receiver No.")
radio/src/translations/i18n/es.h
+1 -4
View File
@@ -664,10 +664,7 @@
#define TR_MENULOGICALSWITCH "INTERRUP.LÓGICO"
#define TR_MENUSTAT TR("ESTAD.", "ESTADÍSTICAS")
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "MONITOR CANALES 1/8"
#define TR_MONITOR_CHANNELS2 "MONITOR CANALES 9/16"
#define TR_MONITOR_CHANNELS3 "MONITOR CANALES 17/24"
#define TR_MONITOR_CHANNELS4 "MONITOR CANALES 25/32"
#define TR_MONITOR_CHANNELS "MONITOR CANALES %d/%d"
#define TR_MONITOR_OUTPUT_DESC "SALIDAS"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("Num Rx", "Receptor No.")
radio/src/translations/i18n/fi.h
+1 -4
View File
@@ -664,10 +664,7 @@
#define TR_MENULOGICALSWITCH "CUSTOM SWITCH"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "CHANNELS 1/8"
#define TR_MONITOR_CHANNELS2 "CHANNELS 9/16"
#define TR_MONITOR_CHANNELS3 "CHANNELS 17/24"
#define TR_MONITOR_CHANNELS4 "CHANNELS 25/32"
#define TR_MONITOR_CHANNELS "CHANNELS %d/%d"
#define TR_MONITOR_OUTPUT_DESC "Outputs"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("RxNum", "Receiver No.")
radio/src/translations/i18n/fr.h
+1 -4
View File
@@ -669,10 +669,7 @@
#define TR_MENULOGICALSWITCH "INTER LOG."
#define TR_MENUSTAT TR("STATS", "STATISTIQUES")
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "VOIES 1-8"
#define TR_MONITOR_CHANNELS2 "VOIES 9-16"
#define TR_MONITOR_CHANNELS3 "VOIES 17-24"
#define TR_MONITOR_CHANNELS4 "VOIES 25-32"
#define TR_MONITOR_CHANNELS "VOIES %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Sorties"
#define TR_MONITOR_MIXER_DESC "Mixeurs"
#define TR_RECEIVER_NUM TR("NumRx", "No. Récepteur")
radio/src/translations/i18n/he.h
+1 -4
View File
@@ -667,10 +667,7 @@
#define TR_MENULOGICALSWITCH "מתג לוגי"
#define TR_MENUSTAT "סטטוס"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "מצגי ערוצים 8-1"
#define TR_MONITOR_CHANNELS2 "מצגי ערוצים 16-9"
#define TR_MONITOR_CHANNELS3 "מצגי ערוצים 24-17"
#define TR_MONITOR_CHANNELS4 "מצגי ערוצים 32-25"
#define TR_MONITOR_CHANNELS "מצגי ערוצים %d-%d"
#define TR_MONITOR_OUTPUT_DESC "יציאות"
#define TR_MONITOR_MIXER_DESC "מיקסרים"
#define TR_RECEIVER_NUM TR("RxNum", "Receiver No.")
radio/src/translations/i18n/it.h
+1 -4
View File
@@ -664,10 +664,7 @@
#define TR_MENULOGICALSWITCH "INTER. PERSON."
#define TR_MENUSTAT "STATO"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "MONITOR CANALI 1/8"
#define TR_MONITOR_CHANNELS2 "MONITOR CANALI 9/16"
#define TR_MONITOR_CHANNELS3 "MONITOR CANALI 17/24"
#define TR_MONITOR_CHANNELS4 "MONITOR CANALI 25/32"
#define TR_MONITOR_CHANNELS "MONITOR CANALI %d/%d"
#define TR_MONITOR_OUTPUT_DESC "Uscite"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("RxNum", "Ricevente N.")
radio/src/translations/i18n/jp.h
+1 -4
View File
@@ -663,10 +663,7 @@
#define TR_MENULOGICALSWITCH "論理スイッチ"
#define TR_MENUSTAT "統計"
#define TR_MENUDEBUG "デバッグ"
#define TR_MONITOR_CHANNELS1 "チャンネルモニター 1-8"
#define TR_MONITOR_CHANNELS2 "チャンネルモニター 9-16"
#define TR_MONITOR_CHANNELS3 "チャンネルモニター 17-24"
#define TR_MONITOR_CHANNELS4 "チャンネルモニター 25-32"
#define TR_MONITOR_CHANNELS "チャンネルモニター %d-%d"
#define TR_MONITOR_OUTPUT_DESC "出力"
#define TR_MONITOR_MIXER_DESC "ミキサー"
#define TR_RECEIVER_NUM TR("RxNum", "受信機 No.")
radio/src/translations/i18n/ko.h
+1 -4
View File
@@ -685,10 +685,7 @@
#define TR_MENUSTAT "통계"
#define TR_MENUDEBUG "디버그"
#define TR_MONITOR_CHANNELS1 "채널 모니터 1-8"
#define TR_MONITOR_CHANNELS2 "채널 모니터 9-16"
#define TR_MONITOR_CHANNELS3 "채널 모니터 17-24"
#define TR_MONITOR_CHANNELS4 "채널 모니터 25-32"
#define TR_MONITOR_CHANNELS "채널 모니터 %d-%d"
#define TR_MONITOR_OUTPUT_DESC "출력 상태"
#define TR_MONITOR_MIXER_DESC "믹서 상태"
radio/src/translations/i18n/nl.h
+1 -4
View File
@@ -666,10 +666,7 @@
#define TR_MENULOGICALSWITCH "LOGISCHE SCHAK."
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "CHANNELS 1-8"
#define TR_MONITOR_CHANNELS2 "CHANNELS 9-16"
#define TR_MONITOR_CHANNELS3 "CHANNELS 17-24"
#define TR_MONITOR_CHANNELS4 "CHANNELS 25-32"
#define TR_MONITOR_CHANNELS "CHANNELS %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Outputs"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("RxNum", "Receiver Nr.")
radio/src/translations/i18n/pl.h
+1 -4
View File
@@ -663,10 +663,7 @@
#define TR_MENULOGICALSWITCH "PRZEŁ. LOGICZNY"
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "MONITOR KANAŁÓW 1/8"
#define TR_MONITOR_CHANNELS2 "MONITOR KANAŁÓW 9/16"
#define TR_MONITOR_CHANNELS3 "MONITOR KANAŁÓW 17/24"
#define TR_MONITOR_CHANNELS4 "MONITOR KANAŁÓW 25/32"
#define TR_MONITOR_CHANNELS "MONITOR KANAŁÓW %d/%d"
#define TR_MONITOR_OUTPUT_DESC "Wyjścia"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("Nr RX", "Nr odbiornika")
radio/src/translations/i18n/pt.h
+1 -4
View File
@@ -664,10 +664,7 @@
#define TR_MENULOGICALSWITCH "CHAVE LÓGICA"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "MONITOR CANAIS 1-8"
#define TR_MONITOR_CHANNELS2 "MONITOR CANAIS 9-16"
#define TR_MONITOR_CHANNELS3 "MONITOR CANAIS 17-24"
#define TR_MONITOR_CHANNELS4 "MONITOR CANAIS 25-32"
#define TR_MONITOR_CHANNELS "MONITOR CANAIS %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Saídas"
#define TR_MONITOR_MIXER_DESC "Mixers"
#define TR_RECEIVER_NUM TR("# Rx", "# Recept")
radio/src/translations/i18n/ru.h
+1 -4
View File
@@ -666,10 +666,7 @@
#define TR_MENULOGICALSWITCH "ЛОГИЧ ТУМБЛ."
#define TR_MENUSTAT "СТАТИСТИКА"
#define TR_MENUDEBUG "ОТЛАДКА"
#define TR_MONITOR_CHANNELS1 "МОНИТОР КАН 1-8"
#define TR_MONITOR_CHANNELS2 "МОНИТОР КАН 9-16"
#define TR_MONITOR_CHANNELS3 "МОНИТОР КАН 17-24"
#define TR_MONITOR_CHANNELS4 "МОНИТОР КАН 25-32"
#define TR_MONITOR_CHANNELS "МОНИТОР КАН %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Выходы"
#define TR_MONITOR_MIXER_DESC "Микшеры"
#define TR_RECEIVER_NUM TR("Rx Ном", "Номер")
radio/src/translations/i18n/se.h
+1 -4
View File
@@ -669,10 +669,7 @@
#define TR_MENULOGICALSWITCH "LOGISK BRYTARE"
#define TR_MENUSTAT "STATISTIK"
#define TR_MENUDEBUG "DEBUG"
#define TR_MONITOR_CHANNELS1 "KANALÖVERSIKT - KA 1-8"
#define TR_MONITOR_CHANNELS2 "KANALÖVERSIKT - KA 9-16"
#define TR_MONITOR_CHANNELS3 "KANALÖVERSIKT - KA 17-24"
#define TR_MONITOR_CHANNELS4 "KANALÖVERSIKT - KA 25-32"
#define TR_MONITOR_CHANNELS "KANALÖVERSIKT - KA %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Utdata"
#define TR_MONITOR_MIXER_DESC "Mixar"
#define TR_RECEIVER_NUM TR("RxNum","Mottagare nr.")
radio/src/translations/i18n/tw.h
+1 -4
View File
@@ -661,10 +661,7 @@
#define TR_MENULOGICALSWITCH "邏輯開關"
#define TR_MENUSTAT "統計"
#define TR_MENUDEBUG "Debug"
#define TR_MONITOR_CHANNELS1 "1-8通道查看"
#define TR_MONITOR_CHANNELS2 "9-16通道查看"
#define TR_MONITOR_CHANNELS3 "17-24通道查看"
#define TR_MONITOR_CHANNELS4 "25-32通道查看"
#define TR_MONITOR_CHANNELS "%d-%d通道查看"
#define TR_MONITOR_OUTPUT_DESC "輸出查看"
#define TR_MONITOR_MIXER_DESC "混控查看"
#define TR_RECEIVER_NUM TR("RxNum", "接收機ID.")
radio/src/translations/i18n/ua.h
+1 -4
View File
@@ -665,10 +665,7 @@
#define TR_MENULOGICALSWITCH "ЛОГІЧНИЙ ПЕРЕМИКАЧ"
#define TR_MENUSTAT "СТАТ."
#define TR_MENUDEBUG "ВІДЛАГОДЖЕННЯ"
#define TR_MONITOR_CHANNELS1 "МОНІТОР КАН 1-8"
#define TR_MONITOR_CHANNELS2 "МОНІТОР КАН 9-16"
#define TR_MONITOR_CHANNELS3 "МОНІТОР КАН 17-24"
#define TR_MONITOR_CHANNELS4 "МОНІТОР КАН 25-32"
#define TR_MONITOR_CHANNELS "МОНІТОР КАН %d-%d"
#define TR_MONITOR_OUTPUT_DESC "Виходи"
#define TR_MONITOR_MIXER_DESC "Мікшери"
#define TR_RECEIVER_NUM TR("RxNum", "No. приймача")
radio/src/translations/string_list.h
+1 -1
View File
@@ -399,7 +399,7 @@ STR(POTWARNINGSTATE)
STR(POTWARNING)
STR(MENUSTAT)
STR(MENUDEBUG)
STRARRAY(MONITOR_CHANNELS)
STR(MONITOR_CHANNELS)
STR(MONITOR_SWITCHES)
STR(MONITOR_OUTPUT_DESC)
STR(MONITOR_MIXER_DESC)
radio/src/translations/translation_def.h
-1
View File
@@ -98,7 +98,6 @@
#define TR_MULTI_DSM_OPTIONS DSM2_OPTION_SERVOFREQ_NAMES
#define TR_MULTI_DSM_CLONE DSM_CLONE_NAMES
#define TR_MONITOR_CHANNELS TR_MONITOR_CHANNELS1, TR_MONITOR_CHANNELS2, TR_MONITOR_CHANNELS3, TR_MONITOR_CHANNELS4
#define TR_TIMER_MODES TR_OFFON,TR_START,TR_THROTTLE_LABEL,TR_THROTTLE_PERCENT_LABEL,TR_THROTTLE_START
#define TR_PHASES_HEADERS TR_PHASES_HEADERS_NAME, TR_PHASES_HEADERS_SW, TR_PHASES_HEADERS_RUD_TRIM, TR_PHASES_HEADERS_ELE_TRIM, TR_PHASES_HEADERS_THT_TRIM, TR_PHASES_HEADERS_AIL_TRIM, TR_PHASES_HEADERS_FAD_IN, TR_PHASES_HEADERS_FAD_OUT
#define TR_LIMITS_HEADERS TR_LIMITS_HEADERS_NAME, TR_LIMITS_HEADERS_SUBTRIM, TR_LIMITS_HEADERS_MIN, TR_LIMITS_HEADERS_MAX, TR_LIMITS_HEADERS_DIRECTION, TR_LIMITS_HEADERS_CURVE, TR_LIMITS_HEADERS_PPMCENTER, TR_LIMITS_HEADERS_SUBTRIMMODE