diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 1809b6c73..893525326 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -565,7 +565,10 @@ bool isInternalModuleAvailable(int moduleType) if (moduleType == MODULE_TYPE_NONE) return true; -#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1) +#if defined(PXX2) && defined(INTERNAL_MODULE_PXX1) + if (moduleType == MODULE_TYPE_XJT_PXX1) + return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); +#elif defined(PXX1) if (moduleType == MODULE_TYPE_XJT_PXX1) return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); #else @@ -573,7 +576,7 @@ bool isInternalModuleAvailable(int moduleType) return false; #endif -#if defined(PXX2) +#if defined(PXX2) && !defined(INTERNAL_MODULE_PXX1) if (moduleType == MODULE_TYPE_ISRM_PXX2) #if defined(INTMODULE_USART) return true; diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index f2ce5289a..7afffdc8e 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -147,6 +147,7 @@ elseif(PCB STREQUAL XLITE) add_definitions(-DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM) add_definitions(-DEEPROM_VARIANT=0x2000) add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) + set(PXX2 ON) set(GUI_DIR 128x64) set(NAVIGATION_TYPE xlite) set(BITMAPS_TARGET 9x_bitmaps) diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 7a62dd138..22e12f62c 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -535,6 +535,9 @@ extern HardwareOptions hardwareOptions; #elif !defined(PXX1) || defined(PCBXLITES) || defined(PCBX9LITE) #define IS_PXX2_INTERNAL_ENABLED() (true) #define IS_PXX1_INTERNAL_ENABLED() (false) +#elif defined(INTERNAL_MODULE_PXX1) + #define IS_PXX2_INTERNAL_ENABLED() (false) + #define IS_PXX1_INTERNAL_ENABLED() (true) #else // TODO #define PXX2_PROBE // TODO #define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)