From 71411fcb6212b7669697f36941bb1fd35ce24991 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 13 Nov 2015 19:26:34 +0400 Subject: [PATCH] LR12 protocol actually doesn't support remote failsafe configuration --- companion/src/modeledit/setup.cpp | 3 ++- radio/src/gui/Taranis/menu_model_setup.cpp | 2 +- radio/src/myeeprom.h | 6 +----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp index 401f78be8..ee5ce7715 100644 --- a/companion/src/modeledit/setup.cpp +++ b/companion/src/modeledit/setup.cpp @@ -237,7 +237,8 @@ void ModulePanel::update() case PULSES_PXX_XJT_LR12: case PULSES_PXX_DJT: mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT; - if ((protocol==PULSES_PXX_XJT_X16) || (protocol==PULSES_PXX_XJT_LR12)) mask |= MASK_FAILSAFES | MASK_RX_NUMBER; + if (protocol==PULSES_PXX_XJT_X16) mask |= MASK_FAILSAFES | MASK_RX_NUMBER; + if (protocol==PULSES_PXX_XJT_LR12) mask |= MASK_RX_NUMBER; break; case PULSES_LP45: case PULSES_DSM2: diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index a83df478f..57444fe4e 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -781,7 +781,7 @@ void menuModelSetup(uint8_t event) else { horzpos_t l_posHorz = m_posHorz; coord_t xOffsetBind = MODEL_SETUP_BIND_OFS; - if (IS_MODULE_XJT(moduleIdx) && !HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[moduleIdx].rfProtocol)) { + if (IS_MODULE_XJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol == RF_PROTO_D8) { xOffsetBind = 0; lcd_putsLeft(y, INDENT "Receiver"); if (attr) l_posHorz += 1; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 6d4918799..d07334914 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -2043,11 +2043,7 @@ enum RFProtocols { #endif }; -#if defined(MODULE_D16_EU_ONLY_SUPPORT) - #define HAS_RF_PROTOCOL_FAILSAFE(protocol) ((protocol) == RF_PROTO_X16) -#else - #define HAS_RF_PROTOCOL_FAILSAFE(protocol) ((protocol) == RF_PROTO_X16 || (protocol) == RF_PROTO_LR12) -#endif +#define HAS_RF_PROTOCOL_FAILSAFE(protocol) ((protocol) == RF_PROTO_X16) enum DSM2Protocols { DSM2_PROTO_LP45,