diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index eac802f48..31fe94e98 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -1207,7 +1207,6 @@ void registerOpenTxFirmwares() /* FrSky X-Lite S/PRO board */ firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES); addOpenTxTaranisOptions(firmware); - firmware->addOption("internalpxx1", Firmware::tr("Support for PXX1 internal module replacement")); registerOpenTxFirmware(firmware); /* FrSky X-Lite board */ diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 9df9addf5..cb024c839 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) +#if defined(PXX1) if (moduleType == MODULE_TYPE_PXX_XJT) return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); #else diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 03fff3ef9..6da864db2 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -1,7 +1,6 @@ option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF) option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(INTERNAL_MODULE_PPM "Support for PPM internal module hack" OFF) -option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module replacement" OFF) option(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF) option(PXX1 "PXX1 protocol support" ON) option(PXX2 "PXX2 protocol support" ON) @@ -274,10 +273,6 @@ if(INTERNAL_MODULE_PPM) add_definitions(-DINTERNAL_MODULE_PPM) endif() -if(INTERNAL_MODULE_PXX1) - add_definitions(-DINTERNAL_MODULE_PXX1) -endif() - if(USEHORUSBT) add_definitions(-DUSEHORUSBT) endif(USEHORUSBT) diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0dee931ca..35e0f5e27 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -702,9 +702,6 @@ // Internal Module #define HARDWARE_INTERNAL_MODULE -#if !(defined(PCBXLITES) && !defined(PCBX9LITE)) - #define INTERNAL_MODULE_PXX1 -#endif #if defined(PCBXLITE) || defined(PCBX9LITE) #define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM3 #define INTMODULE_RCC_APB2Periph RCC_APB2Periph_USART1 diff --git a/radio/util/fwoptions.py b/radio/util/fwoptions.py index 997946f99..94a4c2dcf 100755 --- a/radio/util/fwoptions.py +++ b/radio/util/fwoptions.py @@ -113,8 +113,7 @@ options_taranis_x9lite = { "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), - "multimodule": ("MULTIMODULE", "YES", "NO"), - "internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"), + "multimodule": ("MULTIMODULE", "YES", "NO") } options_taranis_xlite = { @@ -145,7 +144,6 @@ options_taranis_xlites = { "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "multimodule": ("MULTIMODULE", "YES", "NO"), - "internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"), } options_taranis_x9e = {