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

fix(radio): correct different B&W and colorlcd trainer slave UI behaviour (#5067)

Browse Source
This commit is contained in:
Peter Feerick
2024-05-30 11:42:38 +10:00
committed by GitHub
parent dae423e168
commit 2952ee4a9d
10 changed files with 94 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_trainer.cpp
+85 -68
View File
@@ -20,101 +20,118 @@
*/
#include "radio_trainer.h"
#include "opentx.h"
#include "libopenui.h"
#include "input_mapping.h"
#include "hal/adc_driver.h"
#include "input_mapping.h"
#include "libopenui.h"
#include "opentx.h"
#include "strhelpers.h"
#define SET_DIRTY() storageDirty(EE_GENERAL)
#define SET_DIRTY() storageDirty(EE_GENERAL)
RadioTrainerPage::RadioTrainerPage():
PageTab(STR_MENUTRAINER, ICON_RADIO_TRAINER)
RadioTrainerPage::RadioTrainerPage() :
PageTab(STR_MENUTRAINER, ICON_RADIO_TRAINER)
{
}
#if LCD_W > LCD_H
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(13), LV_GRID_FR(10), LV_GRID_FR(10), LV_GRID_FR(10),
LV_GRID_TEMPLATE_LAST};
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(13),
LV_GRID_FR(10), LV_GRID_FR(10),
LV_GRID_FR(10), LV_GRID_TEMPLATE_LAST};
#define NUM_EDIT_W 80
#else
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(15), LV_GRID_FR(9), LV_GRID_FR(9),
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(15),
LV_GRID_FR(9), LV_GRID_FR(9),
LV_GRID_TEMPLATE_LAST};
#define NUM_EDIT_W 65
#endif
static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
void RadioTrainerPage::build(Window * form)
void RadioTrainerPage::build(Window* form)
{
FlexGridLayout grid(col_dsc, row_dsc, PAD_TINY);
form->setFlexLayout();
form->padAll(PAD_SMALL);
auto max_sticks = adcGetMaxInputs(ADC_INPUT_MAIN);
for (uint8_t i = 0; i < max_sticks; i++) {
uint8_t chan = inputMappingChannelOrder(i);
TrainerMix* td = &g_eeGeneral.trainer.mix[chan];
if (SLAVE_MODE()) {
form->setHeight(MENU_BODY_HEIGHT);
auto txt = new StaticText(form, rect_t{}, STR_SLAVE, FONT(L));
lv_obj_align(txt->getLvObj(), LV_ALIGN_CENTER, 0, 0);
} else {
FlexGridLayout grid(col_dsc, row_dsc, PAD_TINY);
form->setFlexLayout();
auto max_sticks = adcGetMaxInputs(ADC_INPUT_MAIN);
for (uint8_t i = 0; i < max_sticks; i++) {
uint8_t chan = inputMappingChannelOrder(i);
TrainerMix* td = &g_eeGeneral.trainer.mix[chan];
auto line = form->newLine(grid);
new StaticText(line, rect_t{}, getMainControlLabel(chan));
new Choice(line, rect_t{}, STR_TRNMODE, 0, 2, GET_SET_DEFAULT(td->mode));
new Choice(line, rect_t{}, STR_TRNCHN, 0, 3, GET_SET_DEFAULT(td->srcChn));
auto weight = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, -125, 125,
GET_SET_DEFAULT(td->studWeight));
weight->setSuffix("%");
#if LCD_H > LCD_W
line = form->newLine(grid);
line->padLeft(30);
line->padBottom(8);
#endif
LcdFlags flags = LEFT | COLOR_THEME_PRIMARY1;
if (g_eeGeneral.ppmunit == PPM_PERCENT_PREC1) flags |= PREC1;
new DynamicNumber<int16_t>(
line, rect_t{},
[=]() {
return (trainerInput[i] - g_eeGeneral.trainer.calib[i]) * 2;
},
flags);
}
auto line = form->newLine(grid);
new StaticText(line, rect_t{}, getMainControlLabel(chan));
#if LCD_H > LCD_W
line->padTop(10);
#else
line->padTop(6);
#endif
new Choice(line, rect_t{}, STR_TRNMODE, 0, 2, GET_SET_DEFAULT(td->mode));
new Choice(line, rect_t{}, STR_TRNCHN, 0, 3, GET_SET_DEFAULT(td->srcChn));
auto weight = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, -125, 125,
GET_SET_DEFAULT(td->studWeight));
weight->setSuffix("%");
// Trainer multiplier
auto lbl = new StaticText(line, rect_t{}, STR_MULTIPLIER);
lbl->padRight(4);
lv_obj_set_grid_cell(lbl->getLvObj(), LV_GRID_ALIGN_END, 0, 2,
LV_GRID_ALIGN_CENTER, 0, 1);
auto multiplier =
new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, -10, 40,
GET_SET_DEFAULT(g_eeGeneral.PPM_Multiplier));
multiplier->setDisplayHandler(
[](int32_t value) { return formatNumberAsString(value + 10, PREC1); });
lv_obj_set_grid_cell(multiplier->getLvObj(), LV_GRID_ALIGN_START, 2, 1,
LV_GRID_ALIGN_CENTER, 0, 1);
#if LCD_H > LCD_W
line = form->newLine(grid);
line->padLeft(30);
line->padBottom(8);
line->padTop(10);
#endif
LcdFlags flags = LEFT | COLOR_THEME_PRIMARY1;
if (g_eeGeneral.ppmunit == PPM_PERCENT_PREC1)
flags |= PREC1;
new DynamicNumber<int16_t>(line, rect_t{},
[=]() { return (trainerInput[i] - g_eeGeneral.trainer.calib[i]) * 2; },
flags);
// Trainer calibration
auto btn = new TextButton(line, rect_t{}, std::string(STR_CALIBRATION),
[=]() -> uint8_t {
memcpy(g_eeGeneral.trainer.calib, trainerInput,
sizeof(g_eeGeneral.trainer.calib));
SET_DIRTY();
return 0;
});
#if LCD_H > LCD_W
lv_obj_set_grid_cell(btn->getLvObj(), LV_GRID_ALIGN_STRETCH, 1, 2,
LV_GRID_ALIGN_CENTER, 0, 1);
#else
lv_obj_set_grid_cell(btn->getLvObj(), LV_GRID_ALIGN_START, 3, 2,
LV_GRID_ALIGN_CENTER, 0, 1);
#endif
}
auto line = form->newLine(grid);
#if LCD_H > LCD_W
line->padTop(10);
#else
line->padTop(6);
#endif
// Trainer multiplier
auto lbl = new StaticText(line, rect_t{}, STR_MULTIPLIER);
lbl->padRight(4);
lv_obj_set_grid_cell(lbl->getLvObj(), LV_GRID_ALIGN_END, 0, 2, LV_GRID_ALIGN_CENTER, 0, 1);
auto multiplier = new NumberEdit(line, rect_t{0, 0, NUM_EDIT_W, 0}, -10, 40,
GET_SET_DEFAULT(g_eeGeneral.PPM_Multiplier));
multiplier->setDisplayHandler(
[](int32_t value) { return formatNumberAsString(value + 10, PREC1); });
lv_obj_set_grid_cell(multiplier->getLvObj(), LV_GRID_ALIGN_START, 2, 1, LV_GRID_ALIGN_CENTER, 0, 1);
#if LCD_H > LCD_W
line = form->newLine(grid);
line->padTop(10);
#endif
// Trainer calibration
auto btn = new TextButton(line, rect_t{}, std::string(STR_CALIBRATION), [=]() -> uint8_t {
memcpy(g_eeGeneral.trainer.calib, trainerInput,
sizeof(g_eeGeneral.trainer.calib));
SET_DIRTY();
return 0;
});
#if LCD_H > LCD_W
lv_obj_set_grid_cell(btn->getLvObj(), LV_GRID_ALIGN_STRETCH, 1, 2, LV_GRID_ALIGN_CENTER, 0, 1);
#else
lv_obj_set_grid_cell(btn->getLvObj(), LV_GRID_ALIGN_START, 3, 2, LV_GRID_ALIGN_CENTER, 0, 1);
#endif
}
radio/src/translations/cn.h
+1 -1
View File
@@ -394,7 +394,7 @@
#define TR_POTS "电位器"
#define TR_SWITCHES "开关"
#define TR_SWITCHES_DELAY TR("开关经过延时", "延时播放(开关经过)")
#define TR_SLAVE CENTER "从机"
#define TR_SLAVE "从机"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "倍率"
#define TR_CAL "校准"
radio/src/translations/da.h
+1 -1
View File
@@ -404,7 +404,7 @@
#define TR_POTS "Drejekontakt"
#define TR_SWITCHES "Kontakter"
#define TR_SWITCHES_DELAY TR("Cen forsink", "Center forsinkelse")
#define TR_SLAVE CENTER "Slave"
#define TR_SLAVE "Slave"
#define TR_MODESRC "Mode\006% Kilde"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Kal"
radio/src/translations/en.h
+1 -1
View File
@@ -399,7 +399,7 @@
#define TR_POTS "Pots"
#define TR_SWITCHES "Switches"
#define TR_SWITCHES_DELAY TR("Play delay", "Play delay (sw. mid pos)")
#define TR_SLAVE CENTER "Slave"
#define TR_SLAVE "Slave"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Cal"
radio/src/translations/he.h
+1 -1
View File
@@ -403,7 +403,7 @@
#define TR_POTS "גלגלות"
#define TR_SWITCHES "מתגים"
#define TR_SWITCHES_DELAY TR("Play delay", "השהיית השמעת מתג")
#define TR_SLAVE CENTER "Slave"
#define TR_SLAVE "Slave"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Cal"
radio/src/translations/jp.h
+1 -1
View File
@@ -398,7 +398,7 @@
#define TR_POTS "ダイヤル"
#define TR_SWITCHES "スイッチ"
#define TR_SWITCHES_DELAY TR("Play delay", "遅延(スイッチ位置)")
#define TR_SLAVE CENTER "スレーブ"
#define TR_SLAVE "スレーブ"
#define TR_MODESRC "モード\006% ソース"
#define TR_MULTIPLIER "倍率"
#define TR_CAL "設定"
radio/src/translations/nl.h
+1 -1
View File
@@ -397,7 +397,7 @@
#define TR_POTS "Pots"
#define TR_SWITCHES TR("Switches","Schakelaars")
#define TR_SWITCHES_DELAY "Vertraging"
#define TR_SLAVE CENTER "Leerling"
#define TR_SLAVE "Leerling"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Cal"
radio/src/translations/pt.h
+1 -1
View File
@@ -402,7 +402,7 @@
#define TR_POTS "Pots"
#define TR_SWITCHES "Chaves"
#define TR_SWITCHES_DELAY TR("Play delay", "Play delay (sw. mid pos)")
#define TR_SLAVE CENTER "Escravo"
#define TR_SLAVE "Escravo"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "Multiplier"
#define TR_CAL "Cal"
radio/src/translations/ru.h
+1 -1
View File
@@ -401,7 +401,7 @@
#define TR_POTS "Потенциом"
#define TR_SWITCHES "Тумблеры"
#define TR_SWITCHES_DELAY TR("Зад воспр", "Задерж воспр (средн. полож. тумбл.)")
#define TR_SLAVE CENTER "Рабочий"
#define TR_SLAVE "Рабочий"
#define TR_MODESRC "Mode\006% Source"
#define TR_MULTIPLIER "Множитель"
#define TR_CAL "Звонок"
radio/src/translations/ua.h
+1 -1
View File
@@ -401,7 +401,7 @@
#define TR_POTS "Потенціометри"
#define TR_SWITCHES "Перемикачі"
#define TR_SWITCHES_DELAY TR("Затримка відтвор.", "Затримка відтворення (середнє полож. перем.)")
#define TR_SLAVE CENTER "Slave" /* use english */
#define TR_SLAVE "Slave" /* use english */
#define TR_MODESRC "Mode\006% Source" /* use english */
#define TR_MULTIPLIER "Множник"
#define TR_CAL "Калібрув."