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

fix: Properly scale PREC2 sensor values using "ratio" (#4083)

Browse Source
This commit is contained in:
Frankie Arzu
2024-01-07 10:19:17 +10:00
committed by GitHub
parent 1daa5526c5
commit 526a87e1f1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_telemetry.cpp
+2 -1
View File
@@ -671,7 +671,8 @@ class SensorEditWindow : public Page {
paramLines[P_RATIO] = form->newLine(&grid);
new StaticText(paramLines[P_RATIO], rect_t{}, STR_RATIO, 0, COLOR_THEME_PRIMARY1);
auto edit = new NumberEdit(paramLines[P_RATIO], rect_t{}, 0, 30000, GET_SET_DEFAULT(sensor->custom.ratio));
auto edit = new NumberEdit(paramLines[P_RATIO], rect_t{}, 0, 30000, GET_SET_DEFAULT(sensor->custom.ratio),
0, PREC1);
edit->setZeroText("-");
paramLines[P_CELLINDEX] = form->newLine(&grid);
radio/src/telemetry/telemetry_sensors.cpp
+4 -1
View File
@@ -707,6 +707,7 @@ int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t
int32_t TelemetrySensor::getValue(int32_t value, uint8_t unit, uint8_t prec) const
{
if (type == TELEM_TYPE_CUSTOM && custom.ratio) {
/* farzu: Not needed, scaling work properly for the 3 types of prec without it
if (this->prec == 2) {
value *= 10;
prec = 2;
@@ -714,7 +715,9 @@ int32_t TelemetrySensor::getValue(int32_t value, uint8_t unit, uint8_t prec) con
else {
prec = 1;
}
value = (custom.ratio * value + 122) / 255;
*/
value = (custom.ratio * value + 122) / 255; // 122/255 (0.48) is to aproximate up (ceiling)
}
value = convertTelemetryValue(value, unit, prec, this->unit, this->prec);