From 326c58a7fd2c68b8d00e816058791dd51de18270 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 25 Jul 2024 23:53:52 +0200 Subject: [PATCH] fix: inconsistency between SD play value, model custom script screen and value widget (#4391) Co-authored-by: Peter Feerick --- radio/src/gui/colorlcd/model_mixer_scripts.cpp | 2 +- radio/src/gui/colorlcd/widgets/value.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/model_mixer_scripts.cpp b/radio/src/gui/colorlcd/model_mixer_scripts.cpp index 82e82ea0b..e67ce4cf8 100644 --- a/radio/src/gui/colorlcd/model_mixer_scripts.cpp +++ b/radio/src/gui/colorlcd/model_mixer_scripts.cpp @@ -157,7 +157,7 @@ class ScriptEditWindow : public Page COLOR_THEME_PRIMARY1); lbl->padLeft(PAD_LARGE); new DynamicNumber( - line, rect_t{}, [=]() { return calcRESXto1000(so->value); }); + line, rect_t{}, [=]() { return calcRESXto1000(so->value); }, PREC1); } } } diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 351fec123..954199a5b 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -136,6 +136,12 @@ class ValueWidget : public Widget TimerOptions timerOptions; timerOptions.options = SHOW_TIME; valueTxt = getTimerString(tme, timerOptions); +#if defined(LUA_INPUTS) + } + else if (field >= MIXSRC_FIRST_LUA && field <= MIXSRC_LAST_LUA) { + valueTxt = + getSourceCustomValueString(field, calcRESXto1000(getValue(field)), valueFlags | PREC1); +#endif } else { valueTxt = getSourceCustomValueString(field, getValue(field), valueFlags);