From 32f7e322b2ae07ed5ee220a60e3fc1bdb575d4a7 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 5 Feb 2017 02:53:48 +0100 Subject: [PATCH] [Companion] Add missing mask when reading multi protocol (fixes #4372) --- companion/src/firmwares/opentx/opentxeeprom.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index 39d6a6401..c5fdaa85b 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -3477,7 +3477,7 @@ void OpenTxModelData::afterImport() else if (modelData.moduleData[module].protocol == PULSES_MULTIMODULE) { // Copy data from ppm struct to multi struct unsigned int multiByte = (unsigned int)((modelData.moduleData[module].ppm.delay - 300) / 50); - modelData.moduleData[module].multi.rfProtocol = subprotocols[module] | ((multiByte & 0x3) << 4); + modelData.moduleData[module].multi.rfProtocol = (subprotocols[module] & 0x0f) | ((multiByte & 0x3) << 4); modelData.moduleData[module].multi.customProto = (multiByte & 0x80) == 0x80; modelData.moduleData[module].multi.optionValue = modelData.moduleData[module].ppm.frameLength; modelData.moduleData[module].multi.lowPowerMode = modelData.moduleData[module].ppm.outputType;