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

fix(color): display only GV name in mix/input overview when used for weight (#5366)

Browse Source 
Also fix EL18 mixer edit layout.
This commit is contained in:
philmoz
2024-08-05 09:55:08 +10:00
committed by GitHub
parent 4b978c347d
commit 5254c8c646
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/controls/source_numberedit.h
+1 -1
View File
@@ -45,7 +45,7 @@ class SourceNumberEdit : public Window
void update();
static LAYOUT_VAL(NUM_EDIT_W, 84, 74)
static LAYOUT_VAL(NUM_EDIT_W, 84, 84)
static LAYOUT_VAL(SRC_BTN_W, 38, 38)
protected:
radio/src/gui/colorlcd/model/mixer_edit.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
LV_GRID_TEMPLATE_LAST};
static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
#else
static const lv_coord_t col_dsc[] = {LV_GRID_FR(2), LV_GRID_FR(3),
static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
LV_GRID_TEMPLATE_LAST};
static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_CONTENT,
LV_GRID_TEMPLATE_LAST};
radio/src/strhelpers.cpp
+6 -2
View File
@@ -437,8 +437,12 @@ char *getValueOrSrcVarString(char *dest, size_t len, gvar_t value, gvar_t vmin,
SourceNumVal v;
v.rawValue = value;
if (v.isSource) {
const char* s = getSourceString(v.value);
strncpy(dest, s, len);
if (v.value >= MIXSRC_FIRST_GVAR && v.value <= MIXSRC_LAST_GVAR) {
getGVarString(dest, v.value - MIXSRC_FIRST_GVAR);
} else {
const char* s = getSourceString(v.value);
strncpy(dest, s, len);
}
} else {
v.value += offset;
if (usePPMUnit && g_eeGeneral.ppmunit == PPM_US)