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

chore(cpn): move global variables from flight/drive modes tab to own tab (#6624)

Browse Source
This commit is contained in:
Neil Horne
2025-10-11 07:53:25 +10:00
committed by GitHub
parent 130860aad5
commit c6668071ea
36 changed files with 1623 additions and 1631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/print/modelprinter.cpp
+2 -16
View File
@@ -274,9 +274,9 @@ QString ModelPrinter::printCenterBeep()
Board::Type board = getCurrentBoard();
int inputs = Boards::getBoardCapability(board, Board::Inputs);
for (int i = 0; i < inputs + firmware->getCapability(RotaryEncoders); i++) {
for (int i = 0; i < inputs; i++) {
if (model.beepANACenter & (0x01 << i)) {
RawSource src((i < inputs) ? SOURCE_TYPE_INPUT : SOURCE_TYPE_ROTARY_ENCODER, (i < inputs) ? i : inputs - i);
RawSource src(SOURCE_TYPE_INPUT, i + 1);
strl << src.toString(&model, &generalSettings);
}
}
@@ -325,20 +325,6 @@ QString ModelPrinter::printGlobalVar(int flightModeIndex, int gvarIndex)
}
}
QString ModelPrinter::printRotaryEncoder(int flightModeIndex, int reIndex)
{
const FlightModeData & fm = model.flightModeData[flightModeIndex];
if (fm.rotaryEncoders[reIndex] <= 1024) {
return QString("%1").arg(fm.rotaryEncoders[reIndex]);
}
else {
int num = fm.rotaryEncoders[reIndex] - 1025;
if (num >= flightModeIndex) num++;
return tr("FM%1").arg(num);
}
}
QString ModelPrinter::printInputName(int idx)
{
RawSourceType srcType = (firmware->getCapability(VirtualInputs) ? SOURCE_TYPE_VIRTUAL_INPUT : SOURCE_TYPE_INPUT);