Fixes #2474 - Needs test, thanks!

This commit is contained in:
bsongis
2015-07-17 00:13:24 +02:00
parent 475f1f1b2a
commit 5fdff961a6
@@ -3231,10 +3231,6 @@ void OpenTxModelData::afterImport()
}
}
if (IS_TARANIS(board) && modelData.moduleData[0].protocol == 0) {
modelData.moduleData[0].protocol = PXX_XJT_X16;
}
for (int module=0; module<3; module++) {
if (modelData.moduleData[module].protocol == PXX_XJT_X16 || modelData.moduleData[module].protocol == LP45) {
if (subprotocols[module] >= 0)
@@ -3243,6 +3239,10 @@ void OpenTxModelData::afterImport()
modelData.moduleData[module].protocol = OFF;
}
}
if (IS_TARANIS(board) && version < 217 && modelData.moduleData[1].protocol != OFF) {
modelData.moduleData[1].modelId = modelData.moduleData[0].modelId;
}
}
OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum board, unsigned int version, unsigned int variant):