From a5759fd4d1ac1a4b24b835e31c56a171ff3855c3 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 8 Feb 2019 15:48:06 +0100 Subject: [PATCH] Failsafe UI fix --- radio/src/gui/gui_common.h | 2 +- radio/src/pulses/modules.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/gui_common.h b/radio/src/gui/gui_common.h index 427423a71..169ae51ff 100644 --- a/radio/src/gui/gui_common.h +++ b/radio/src/gui/gui_common.h @@ -156,7 +156,7 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol); #define IS_D8_RX(x) (g_model.moduleData[x].rfProtocol == RF_PROTO_D8) #define IS_R9M_OR_XJTD16(x) ((isModuleXJT(x) && g_model.moduleData[x].rfProtocol== RF_PROTO_X16) || isModuleR9M(x)) -#define FAILSAFE_ROWS(x) ((isModuleXJT(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol)) || MULTIMODULE_HASFAILSAFE(x) || isModuleR9M(x)) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW +#define FAILSAFE_ROWS(x) ((isModuleXJTVariant(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol)) || MULTIMODULE_HASFAILSAFE(x) || isModuleR9M(x)) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW #if defined(PCBXLITE) #define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW) diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index 6e4ca4144..5325100e5 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -52,6 +52,12 @@ inline bool isModuleXJT(uint8_t idx) { return g_model.moduleData[idx].type == MODULE_TYPE_XJT; } + +inline bool isModuleXJTVariant(uint8_t idx) +{ + return g_model.moduleData[idx].type == MODULE_TYPE_XJT || g_model.moduleData[idx].type == MODULE_TYPE_XJT2; +} + #else inline bool isModuleXJT(uint8_t idx) {