From 7fb9aad61f43f622fc18688dc1becad0ac704a57 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 31 Jan 2017 07:48:58 +0100 Subject: [PATCH] [MULTI] Fix Frksy EU pulses actually send the right type --- radio/src/myeeprom.h | 4 +++- radio/src/pulses/multi_arm.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 529370438..b4649f063 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -546,7 +546,9 @@ enum MMRFrskySubtypes { MM_RF_FRSKY_SUBTYPE_D16, MM_RF_FRSKY_SUBTYPE_D8, MM_RF_FRSKY_SUBTYPE_D16_8CH, - MM_RF_FRSKY_SUBTYPE_V8 + MM_RF_FRSKY_SUBTYPE_V8, + MM_RF_FRSKY_SUBTYPE_D16_LBT, + MM_RF_FRSKY_SUBTYPE_D16_LBT_8CH }; #define HAS_RF_PROTOCOL_FAILSAFE(rf) ((rf) == RF_PROTO_X16) diff --git a/radio/src/pulses/multi_arm.cpp b/radio/src/pulses/multi_arm.cpp index 0c1321249..a6ea4e530 100644 --- a/radio/src/pulses/multi_arm.cpp +++ b/radio/src/pulses/multi_arm.cpp @@ -158,9 +158,13 @@ void setupPulsesMultimodule(uint8_t port) } else { type = 15; if (subtype == MM_RF_FRSKY_SUBTYPE_D16_8CH) // D16 8ch - subtype = 1; + subtype = 1; + else if (subtype == MM_RF_FRSKY_SUBTYPE_D16) + subtype = 0; // D16 + else if (subtype == MM_RF_FRSKY_SUBTYPE_D16_LBT) + subtype = 2; else - subtype = 0; // D16 + subtype = 3; // MM_RF_FRSKY_SUBTYPE_D16_LBT_8CH } }