From 5fdff961a6eaf405fbf90f3588cabfbf3fb76f49 Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 17 Jul 2015 00:13:24 +0200 Subject: [PATCH] Fixes #2474 - Needs test, thanks! --- companion/src/firmwares/opentx/opentxeeprom.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 9506dfc35..b225c0120 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -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):