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

fix(cpn): mode strings for surface radios (#6507)

Browse Source
This commit is contained in:
ikkemaniac
2025-08-18 12:43:00 +10:00
committed by GitHub
parent a9a0edefe8
commit f30e7f1e77
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+11 -4
View File
@@ -475,16 +475,23 @@ QString ModelPrinter::printFlightModes(unsigned int flightModes)
int numFlightModes = firmware->getCapability(FlightModes);
if (numFlightModes && flightModes) {
if (flightModes == (unsigned int)(1 << numFlightModes) - 1) {
return tr("Disabled in all flight modes");
}
else {
return (Boards::getCapability(getCurrentBoard(), Board::Air)
? tr("Disabled in all flight modes")
: tr("Disabled in all drive modes"));
} else {
QStringList list;
for (int i = 0; i < numFlightModes; i++) {
if (!(flightModes & (1 << i))) {
list << printFlightModeName(i);
}
}
return (list.size() > 1 ? tr("Flight modes") : tr("Flight mode")) + QString("(%1)").arg(list.join(", "));
if (Boards::getCapability(getCurrentBoard(), Board::Air)) {
return (list.size() > 1 ? tr("Flight modes") : tr("Flight mode")) +
QString("(%1)").arg(list.join(", "));
} else {
return (list.size() > 1 ? tr("Drive modes") : tr("Drive mode")) +
QString("(%1)").arg(list.join(", "));
};
}
}
else
companion/src/multimodelprinter.cpp
+14 -4
View File
@@ -424,13 +424,20 @@ QString MultiModelPrinter::printHeliSetup()
QString MultiModelPrinter::printFlightModes()
{
QString str = printTitle(tr("Flight modes"));
QString str = printTitle(Boards::getCapability(getCurrentBoard(), Board::Air)
? tr("Flight modes")
: tr("Drive modes"));
// Trims
{
MultiColumns columns(modelPrinterMap.size());
columns.appendSectionTableStart();
QStringList hd = QStringList() << tr("Flight mode") << tr("Switch") << tr("F.In") << tr("F.Out");
for (int i = 0; i < getBoardCapability(getCurrentBoard(), Board::NumTrims); i++) {
QStringList hd = QStringList()
<< (Boards::getCapability(getCurrentBoard(), Board::Air)
? tr("Flight mode")
: tr("Drive mode"))
<< tr("Switch") << tr("F.In") << tr("F.Out");
for (int i = 0; i < getBoardCapability(getCurrentBoard(), Board::NumTrims);
i++) {
hd << RawSource(SOURCE_TYPE_TRIM, i + 1).toString();
}
columns.appendRowHeader(hd);
@@ -502,7 +509,10 @@ QString MultiModelPrinter::printFlightModes()
columns.appendRowEnd();
}
columns.appendRowHeader(QStringList() << tr("Flight mode"));
columns.appendRowHeader(
QStringList() << (Boards::getCapability(getCurrentBoard(), Board::Air)
? tr("Flight mode")
: tr("Drive mode")));
for (int i = 0; i < firmware->getCapability(FlightModes); i++) {
columns.appendRowStart();