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

Merge pull request #8545 from opentx/opentx/fix-8541-trainer

Browse Source
This commit is contained in:
elecpower
2021-10-14 20:34:53 +11:00
committed by Peter Feerick
parent aabce2cf26
commit a62545a674
9 changed files with 120 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+2 -27
View File
@@ -190,9 +190,9 @@ QString ModelPrinter::printModule(int idx)
QString result;
ModuleData module = model.moduleData[(idx<0 ? CPN_MAX_MODULES : idx)];
if (idx < 0) {
str << printLabelValue(tr("Mode"), printTrainerMode());
str << printLabelValue(tr("Mode"), model.trainerModeToString());
if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
if (model.trainerMode == TRAINER_SLAVE_JACK) {
if (model.trainerMode == TRAINER_MODE_SLAVE_JACK) {
str << printLabelValue(tr("Channels"), QString("%1-%2").arg(module.channelsStart + 1).arg(module.channelsStart + module.channelsCount));
str << printLabelValue(tr("Frame length"), QString("%1ms").arg(printPPMFrameLength(module.ppm.frameLength)));
str << printLabelValue(tr("PPM delay"), QString("%1us").arg(module.ppm.delay));
@@ -239,31 +239,6 @@ QString ModelPrinter::printModule(int idx)
return result;
}
QString ModelPrinter::printTrainerMode()
{
QString result;
switch (model.trainerMode) {
case TRAINER_MASTER_JACK:
result = tr("Master/Jack");
break;
case TRAINER_SLAVE_JACK:
result = tr("Slave/Jack");
break;
case TRAINER_MASTER_SBUS_MODULE:
result = tr("Master/SBUS Module");
break;
case TRAINER_MASTER_CPPM_MODULE:
result = tr("Master/CPPM Module");
break;
case TRAINER_MASTER_SBUS_BATT_COMPARTMENT:
result = tr("Master/SBUS in battery compartment");
break;
default:
result = CPN_STR_UNKNOWN_ITEM;
}
return result;
}
QString ModelPrinter::printHeliSwashType ()
{
switch (model.swashRingData.type) {