From ad8914f44ad4060e9fdf640572e880e478e7d33e Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 1 Aug 2021 13:01:23 +1000 Subject: [PATCH 1/2] Add missing label, dependent on source --- radio/src/gui/colorlcd/special_functions.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/special_functions.cpp b/radio/src/gui/colorlcd/special_functions.cpp index 83e6523e6..a37ae6053 100644 --- a/radio/src/gui/colorlcd/special_functions.cpp +++ b/radio/src/gui/colorlcd/special_functions.cpp @@ -294,7 +294,7 @@ class SpecialFunctionEditPage : public Page switch (CFN_GVAR_MODE(cfn)) { case FUNC_ADJUST_GVAR_CONSTANT: { - //TODO: label + new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_CONSTANT); int16_t val_min, val_max; getMixSrcRange(CFN_GVAR_INDEX(cfn) + MIXSRC_FIRST_GVAR, val_min, val_max); @@ -303,11 +303,12 @@ class SpecialFunctionEditPage : public Page break; } case FUNC_ADJUST_GVAR_SOURCE: - //TODO: label + new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_MIXSOURCE); new SourceChoice(specialFunctionOneWindow, grid.getFieldSlot(), 0, MIXSRC_LAST_CH, GET_SET_DEFAULT(CFN_PARAM(cfn))); break; case FUNC_ADJUST_GVAR_GVAR: { + new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_GLOBAL_VAR); auto gvarchoice = new Choice(specialFunctionOneWindow, grid.getFieldSlot(), 0, MAX_GVARS - 1, GET_SET_DEFAULT(CFN_PARAM(cfn))); @@ -320,6 +321,7 @@ class SpecialFunctionEditPage : public Page break; } case FUNC_ADJUST_GVAR_INCDEC: { + new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_INCDEC); int16_t val_min, val_max; getMixSrcRange(CFN_GVAR_INDEX(cfn) + MIXSRC_FIRST_GVAR, val_min, val_max); getGVarIncDecRange(val_min, val_max); From 34983c39162d33c6fd567058de3edce0ac7c79a8 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sun, 1 Aug 2021 13:10:14 +1000 Subject: [PATCH 2/2] Use STR_GLOBALVAR string for consistency --- radio/src/gui/colorlcd/special_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/special_functions.cpp b/radio/src/gui/colorlcd/special_functions.cpp index a37ae6053..59e5ef692 100644 --- a/radio/src/gui/colorlcd/special_functions.cpp +++ b/radio/src/gui/colorlcd/special_functions.cpp @@ -308,7 +308,7 @@ class SpecialFunctionEditPage : public Page 0, MIXSRC_LAST_CH, GET_SET_DEFAULT(CFN_PARAM(cfn))); break; case FUNC_ADJUST_GVAR_GVAR: { - new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_GLOBAL_VAR); + new StaticText(specialFunctionOneWindow, grid.getLabelSlot(), STR_GLOBALVAR); auto gvarchoice = new Choice(specialFunctionOneWindow, grid.getFieldSlot(), 0, MAX_GVARS - 1, GET_SET_DEFAULT(CFN_PARAM(cfn)));