From 31ed6cd9e6bb4c909514c3a147e616da70a469df Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 22 May 2019 10:32:12 +0200 Subject: [PATCH] REvert previous fix and do it differently --- radio/src/gui/gui_common.cpp | 2 +- radio/src/targets/horus/board.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 525fa7259..6a2eff55d 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -568,7 +568,7 @@ bool isInternalModuleAvailable(int moduleType) if (moduleType == MODULE_TYPE_NONE) return true; -#if defined(PXX1) && (defined(INTERNAL_MODULE_PXX1) || !defined(PXX2)) +#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1) if (moduleType == MODULE_TYPE_PXX_XJT) return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); #else diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index 6f624382e..a331b5239 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -190,6 +190,7 @@ void SDRAM_Init(void); #define EXTERNAL_MODULE_OFF() GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) #define IS_INTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN) == Bit_SET) #define IS_EXTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) == Bit_SET) +#define INTERNAL_MODULE_PXX1 #if !defined(PXX2) #define IS_PXX2_INTERNAL_ENABLED() (false)