From a22c2ec954b59c85df844df9a55cc9ca4a2172dd Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 28 Apr 2025 20:42:13 +1000 Subject: [PATCH] feat(color): value widget now shows voltage suffix for handset voltage (#6113) --- radio/src/gui/colorlcd/widgets/value.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp index 193afc756..ae2d91fdc 100644 --- a/radio/src/gui/colorlcd/widgets/value.cpp +++ b/radio/src/gui/colorlcd/widgets/value.cpp @@ -126,19 +126,25 @@ class ValueWidget : public Widget std::string valueTxt; // Set value text - if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER) { - TimerState& timerState = timersStates[field - MIXSRC_FIRST_TIMER]; - TimerOptions timerOptions; - timerOptions.options = SHOW_TIMER; - valueTxt = getTimerString(abs(timerState.val), timerOptions); + if (field == MIXSRC_TX_VOLTAGE) { + valueTxt = + getSourceCustomValueString(field, getValue(field), valueFlags); + valueTxt += STR_V; } else if (field == MIXSRC_TX_TIME) { int32_t tme = getValue(MIXSRC_TX_TIME); TimerOptions timerOptions; timerOptions.options = SHOW_TIME; valueTxt = getTimerString(tme, timerOptions); + } else if (field >= MIXSRC_FIRST_TIMER && field <= MIXSRC_LAST_TIMER) { + TimerState& timerState = timersStates[field - MIXSRC_FIRST_TIMER]; + TimerOptions timerOptions; + timerOptions.options = SHOW_TIMER; + valueTxt = getTimerString(abs(timerState.val), timerOptions); } else if (field >= MIXSRC_FIRST_TELEM) { - std::string getSensorCustomValue(uint8_t sensor, int32_t value, LcdFlags flags); - valueTxt = getSensorCustomValue((field - MIXSRC_FIRST_TELEM) / 3, getValue(field), valueFlags); + std::string getSensorCustomValue(uint8_t sensor, int32_t value, + LcdFlags flags); + valueTxt = getSensorCustomValue((field - MIXSRC_FIRST_TELEM) / 3, + getValue(field), valueFlags); #if defined(LUA_INPUTS) } else if (field >= MIXSRC_FIRST_LUA && field <= MIXSRC_LAST_LUA) {