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

fix(cpn): more fixes to RawSource calls (#5155)

Browse Source 
Arising from index shift in #4722
This commit is contained in:
philmoz
2024-06-12 09:12:04 +10:00
committed by GitHub
parent 993f2713d4
commit 0c742e2863
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+6 -2
View File
@@ -429,7 +429,7 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
if (mix.carryTrim > 0)
str += " " + tr("NoTrim");
else if (mix.carryTrim < 0)
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(mix.carryTrim)-1)).toString(&model, &generalSettings);
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(mix.carryTrim)-1) + 1).toString(&model, &generalSettings);
if (firmware->getCapability(HasNoExpo) && mix.noExpo)
str += " " + tr("No DR/Expo").toHtmlEscaped();
@@ -696,7 +696,7 @@ QString ModelPrinter::printOutputValueGVar(int val)
if (abs(val) > 10000) {
if (val < 0)
result = "-";
result.append(RawSource(SOURCE_TYPE_GVAR, abs(val)-10001).toString(&model));
result.append(RawSource(SOURCE_TYPE_GVAR, (abs(val)-10001) + 1).toString(&model));
}
else {
if (val >= 0)
@@ -932,6 +932,10 @@ QString ModelPrinter::printThrottle()
result << printLabelValue(tr("Trim idle only"), printBoolean(model.thrTrim, BOOLEAN_YESNO));
result << printLabelValue(tr("Warning"), printBoolean(!model.disableThrottleWarning, BOOLEAN_YESNO));
result << printLabelValue(tr("Reversed"), printBoolean(model.throttleReversed, BOOLEAN_YESNO));
int thrTrim = model.thrTrimSwitch;
if (thrTrim == 0) thrTrim = 2;
else if (thrTrim == 2) thrTrim = 0;
result << printLabelValue(tr("Trim source"), RawSource(SOURCE_TYPE_TRIM, thrTrim + 1).toString(&model, &generalSettings));
return result.join(" ");
}