From 5f37969b27d5c4c717474390c3be58295680609d Mon Sep 17 00:00:00 2001 From: Neil Horne <15316949+elecpower@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:17:08 +1100 Subject: [PATCH] fix(cpn): logical switch global variable unit and precision (#6906) --- companion/src/firmwares/rawsource.cpp | 2 +- companion/src/print/modelprinter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/firmwares/rawsource.cpp b/companion/src/firmwares/rawsource.cpp index c784bafb6..4897b8a78 100644 --- a/companion/src/firmwares/rawsource.cpp +++ b/companion/src/firmwares/rawsource.cpp @@ -77,7 +77,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting break; case SOURCE_TYPE_GVAR: { - GVarData gv = model->gvarData[index]; + GVarData gv = model->gvarData[index - 1]; result.step = gv.multiplierGet(); result.decimals = gv.prec; result.max = gv.getMaxPrec(); diff --git a/companion/src/print/modelprinter.cpp b/companion/src/print/modelprinter.cpp index 227d0607b..10a46797c 100644 --- a/companion/src/print/modelprinter.cpp +++ b/companion/src/print/modelprinter.cpp @@ -561,7 +561,7 @@ QString ModelPrinter::printLogicalSwitchLine(int idx) result += " ~ "; else result += tr(" missing"); - result += QString::number(range.step * (ls.val2 /*TODO+ source.getRawOffset(model)*/) + range.offset); + result += QString::number((double)(range.step * ls.val2 /*TODO+ source.getRawOffset(model)*/) + range.offset, 'f', range.decimals); result += range.unit; break; }