Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 19:40:20 +03:00
Code Issues Wiki Activity

Compilation options updated

Browse source
This commit is contained in:
Bertrand Songis 2019-05-16 10:39:02 +02:00
parent d7119b170d
commit 68a9edc887
5 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -1207,7 +1207,6 @@ void registerOpenTxFirmwares()
/* FrSky X-Lite S/PRO board */ /* FrSky X-Lite S/PRO board */
firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES); firmware = new OpenTxFirmware("opentx-xlites", QCoreApplication::translate("Firmware", "FrSky Taranis X-Lite S/PRO"), BOARD_TARANIS_XLITES);
addOpenTxTaranisOptions(firmware); addOpenTxTaranisOptions(firmware);
firmware->addOption("internalpxx1", Firmware::tr("Support for PXX1 internal module replacement"));
registerOpenTxFirmware(firmware); registerOpenTxFirmware(firmware);
/* FrSky X-Lite board */ /* FrSky X-Lite board */

2
radio/src/gui/gui_common.cpp
View file

@ -568,7 +568,7 @@ bool isInternalModuleAvailable(int moduleType)
if (moduleType == MODULE_TYPE_NONE) if (moduleType == MODULE_TYPE_NONE)
return true; return true;
#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1) #if defined(PXX1)
if (moduleType == MODULE_TYPE_PXX_XJT) if (moduleType == MODULE_TYPE_PXX_XJT)
return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
#else #else

5
radio/src/targets/taranis/CMakeLists.txt
View file

@ -1,7 +1,6 @@
option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF) option(SHUTDOWN_CONFIRMATION "Shutdown confirmation" OFF)
option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF) option(LCD_DUAL_BUFFER "Dual LCD Buffer" OFF)
option(INTERNAL_MODULE_PPM "Support for PPM internal module hack" 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(USEHORUSBT "X9E BT module replaced by Horus BT module" OFF)
option(PXX1 "PXX1 protocol support" ON) option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" ON) option(PXX2 "PXX2 protocol support" ON)
@ -274,10 +273,6 @@ if(INTERNAL_MODULE_PPM)
add_definitions(-DINTERNAL_MODULE_PPM) add_definitions(-DINTERNAL_MODULE_PPM)
endif() endif()
if(INTERNAL_MODULE_PXX1)
add_definitions(-DINTERNAL_MODULE_PXX1)
endif()
if(USEHORUSBT) if(USEHORUSBT)
add_definitions(-DUSEHORUSBT) add_definitions(-DUSEHORUSBT)
endif(USEHORUSBT) endif(USEHORUSBT)

3
radio/src/targets/taranis/hal.h
View file

@ -702,9 +702,6 @@
// Internal Module // Internal Module
#define HARDWARE_INTERNAL_MODULE #define HARDWARE_INTERNAL_MODULE
#if !(defined(PCBXLITES) && !defined(PCBX9LITE))
#define INTERNAL_MODULE_PXX1
#endif
#if defined(PCBXLITE) || defined(PCBX9LITE) #if defined(PCBXLITE) || defined(PCBX9LITE)
#define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM3 #define INTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM3
#define INTMODULE_RCC_APB2Periph RCC_APB2Periph_USART1 #define INTMODULE_RCC_APB2Periph RCC_APB2Periph_USART1

4
radio/util/fwoptions.py
View file

@ -113,8 +113,7 @@ options_taranis_x9lite = {
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"), "nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"), "multimodule": ("MULTIMODULE", "YES", "NO")
"internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"),
} }
options_taranis_xlite = { options_taranis_xlite = {
@ -145,7 +144,6 @@ options_taranis_xlites = {
"shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"), "shutdownconfirm": ("SHUTDOWN_CONFIRMATION", "YES", "NO"),
"eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"), "eu": ("SUPPORT_D16_EU_ONLY", "YES", "NO"),
"multimodule": ("MULTIMODULE", "YES", "NO"), "multimodule": ("MULTIMODULE", "YES", "NO"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"),
} }
options_taranis_x9e = { options_taranis_x9e = {