From 2d67629e1728a305e23a8dcad432e6e9c79e5097 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 27 Apr 2019 09:31:58 +0200 Subject: [PATCH] Improve fix for internal module not supporting PXX1 --- radio/src/gui/gui_common.cpp | 2 +- radio/src/targets/taranis/hal.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index f1b15147d..45adfb3a1 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -576,7 +576,7 @@ bool isInternalModuleAvailable(int moduleType) #if defined(PXX1) if (moduleType == MODULE_TYPE_XJT) -#if defined(PCBXLITES) +#if defined(INTMODULE_NO_PXX1) return false; #else return (!isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type)); diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 1f60ab49f..7bdd8a2d0 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -671,6 +671,9 @@ // Internal Module #define HARDWARE_INTERNAL_MODULE +#if defined(PCBXLITES) || defined(PCBX3) + #define INTMODULE_NO_PXX1 +#endif #if defined(PCBXLITE) || defined(PCBX3) #define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM3 #define INTMODULE_RCC_APB2Periph RCC_APB2Periph_USART1