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

fix(color): outputs widget channel value may not update if unit is set to μs (#6343)

Browse Source
This commit is contained in:
philmoz
2025-06-13 11:58:00 +10:00
committed by GitHub
parent 2cf06231d2
commit a76288ded5
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/widgets/outputs.cpp
+24 -12
View File
@@ -21,6 +21,9 @@
#include "edgetx.h"
#include "widget.h"
#include <cstdint>
constexpr int16_t OUTPUT_INVALID_VALUE = INT16_MIN;
#define ETX_STATE_BG_FILL LV_STATE_USER_1
@@ -99,12 +102,8 @@ class ChannelValue : public Window
{
int16_t value = channelOutputs[channel];
const int lim = (g_model.extendedLimits ? (1024 * LIMIT_EXT_PERCENT / 100) : 1024);
uint16_t w = width() - PAD_TINY;
int16_t scaledValue = divRoundClosest(w * limit<int16_t>(-lim, value, lim), lim * 2);
if (scaledValue != lastValue) {
lastValue = scaledValue;
if (value != lastValue) {
lastValue = value;
std::string s;
if (g_eeGeneral.ppmunit == PPM_US)
@@ -114,13 +113,24 @@ class ChannelValue : public Window
else
s = formatNumberAsString(calcRESXto100(value), 0, 0, "", "%");
lv_label_set_text(valueLabel, s.c_str());
if (s != lastText) {
lastText = s;
lv_label_set_text(valueLabel, s.c_str());
}
uint16_t fillW = abs(scaledValue);
uint16_t x = value > 0 ? w / 2 : w / 2 - fillW + 1;
const int lim = (g_model.extendedLimits ? (1024 * LIMIT_EXT_PERCENT / 100) : 1024);
uint16_t w = width() - PAD_TINY;
int16_t scaledValue = divRoundClosest(w * limit<int16_t>(-lim, value, lim), lim * 2);
lv_obj_set_pos(bar, x, 0);
lv_obj_set_size(bar, fillW, ROW_HEIGHT - 1);
if (scaledValue != lastScaledValue) {
lastScaledValue = scaledValue;
uint16_t fillW = abs(scaledValue);
uint16_t x = value > 0 ? w / 2 : w / 2 - fillW + 1;
lv_obj_set_pos(bar, x, 0);
lv_obj_set_size(bar, fillW, ROW_HEIGHT - 1);
}
}
bool hasName = g_model.limitData[channel].name[0] != 0;
@@ -134,7 +144,9 @@ class ChannelValue : public Window
protected:
uint8_t channel;
int16_t lastValue = -32768;
int16_t lastValue = OUTPUT_INVALID_VALUE;
int16_t lastScaledValue = OUTPUT_INVALID_VALUE;
std::string lastText;
bool chanHasName = false;
lv_style_t style;
lv_obj_t* valueLabel = nullptr;