[Horus] Fixes #4407 (#4543)

* [Horus] Fixes #4407

* Tab replace by spaces
This commit is contained in:
Bertrand Songis
2017-03-04 10:15:06 +01:00
committed by GitHub
parent 481df9ee3d
commit 6f0e58351a
3 changed files with 9 additions and 4 deletions
@@ -3473,6 +3473,10 @@ void OpenTxModelData::afterImport()
}
}
if (IS_HORUS(board)) {
modelData.moduleData[0].protocol = PULSES_PXX_XJT_X16;
}
for (int module=0; module<3; module++) {
if (modelData.moduleData[module].protocol == PULSES_PXX_XJT_X16 || modelData.moduleData[module].protocol == PULSES_LP45) {
if (subprotocols[module] >= 0)
@@ -99,7 +99,7 @@ class ProtocolsConversionTable: public ConversionTable
addConversion(PULSES_DSMX, val++);
}
if (IS_HORUS_OR_TARANIS(board)) {
addConversion(PULSES_CROSSFIRE, val++);
addConversion(PULSES_CROSSFIRE, val++);
addConversion(PULSES_MULTIMODULE, val++);
}
}
+4 -3
View File
@@ -238,9 +238,9 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
lock = false;
// a change will not register if only one item was added
if (ui->protocol->count() == 1)
if (ui->protocol->count() == 1) {
on_protocol_currentIndexChanged(ui->protocol->currentIndex());
}
}
ModulePanel::~ModulePanel()
@@ -406,8 +406,9 @@ void ModulePanel::update()
mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
}
if (moduleHasFailsafes())
if (moduleHasFailsafes()) {
mask |= MASK_FAILSAFES;
}
ui->label_protocol->setVisible(mask & MASK_PROTOCOL);
ui->protocol->setVisible(mask & MASK_PROTOCOL);