From d8ffd1eada71718cbeebdcc76e5a61a90da2625e Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 2 May 2020 20:03:17 +0200 Subject: [PATCH] Fix companion handling of unknow protocols (#7567) * Tentative fix * cosmetics --- companion/src/firmwares/multiprotocols.cpp | 5 +---- companion/src/firmwares/opentx/opentxeeprom.cpp | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/companion/src/firmwares/multiprotocols.cpp b/companion/src/firmwares/multiprotocols.cpp index 0dcc299e9..7b13a2b19 100644 --- a/companion/src/firmwares/multiprotocols.cpp +++ b/companion/src/firmwares/multiprotocols.cpp @@ -173,10 +173,7 @@ QString Multiprotocols::protocolToString(int protocol, bool custom) "Bayang RX", "Pelikan", "Tiger", "WK", "XN297 Dump", "FrSky X 2.1", "FrSky R9" }); - if (protocol == MM_RF_CUSTOM_SELECTED || custom) - return tr("Custom - proto %1)").arg(protocol); - else - return strings.value(protocol, CPN_STR_UNKNOWN_ITEM); + return strings.value(protocol, CPN_STR_UNKNOWN_ITEM); } // static diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index cfeb5278a..7053118d5 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2056,8 +2056,6 @@ class ModuleUnionField: public UnionField { void beforeExport() override { - if (module.multi.rfProtocol > MODULE_SUBTYPE_MULTI_LAST) - module.multi.rfProtocol += 3; rfProtExtra = (module.multi.rfProtocol & 0x70) >> 4; module.multi.rfProtocol &= 0x0f; } @@ -2065,8 +2063,6 @@ class ModuleUnionField: public UnionField { void afterImport() override { module.multi.rfProtocol = (rfProtExtra << 4) + (module.rfProtocol & 0xf); - if (module.multi.rfProtocol > MODULE_SUBTYPE_MULTI_LAST) - module.multi.rfProtocol -= 3; } private: