chore(cpn): move global variables from flight/drive modes tab to own tab (#6624)
This commit is contained in:
@@ -460,9 +460,10 @@ QString MultiModelPrinter::printFlightModes()
|
||||
str.append(columns.print());
|
||||
}
|
||||
|
||||
// GVars and Rotary Encoders
|
||||
// GVars
|
||||
int gvars = firmware->getCapability(Gvars);
|
||||
if ((gvars && firmware->getCapability(GvarsFlightModes)) || firmware->getCapability(RotaryEncoders)) {
|
||||
|
||||
if (gvars && firmware->getCapability(GvarsFlightModes)) {
|
||||
MultiColumns columns(modelPrinterMap.size());
|
||||
columns.appendSectionTableStart();
|
||||
QStringList hd = QStringList() << tr("Global vars");
|
||||
@@ -471,9 +472,6 @@ QString MultiModelPrinter::printFlightModes()
|
||||
hd << tr("GV%1").arg(i + 1);
|
||||
}
|
||||
}
|
||||
for (int i=0; i<firmware->getCapability(RotaryEncoders); i++) {
|
||||
hd << tr("RE%1").arg(i + 1);
|
||||
}
|
||||
columns.appendRowHeader(hd);
|
||||
int wd = 80 / gvars;
|
||||
if (firmware->getCapability(GvarsFlightModes)) {
|
||||
@@ -524,9 +522,7 @@ QString MultiModelPrinter::printFlightModes()
|
||||
COMPARECELL(modelPrinter->printGlobalVar(i, k));
|
||||
}
|
||||
}
|
||||
for (int k = 0; k < firmware->getCapability(RotaryEncoders); k++) {
|
||||
COMPARECELL(modelPrinter->printRotaryEncoder(i, k));
|
||||
}
|
||||
|
||||
columns.appendRowEnd();
|
||||
}
|
||||
columns.appendTableEnd();
|
||||
|
||||
Reference in New Issue
Block a user