Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 00:35:14 +03:00
Code Activity

Revert "Compilation options updated"

Browse source 
This reverts commit 68a9edc8
This commit is contained in:
Bertrand Songis 2019-05-16 14:50:23 +02:00
parent e69965ff46
commit 0774567df7
5 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1207,6 +1207,7 @@ 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 */

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

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

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

@ -1,6 +1,7 @@
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)
@ -273,6 +274,10 @@ 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)

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

@ -702,6 +702,9 @@
// 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

4
radio/util/fwoptions.py
View file

@ -113,7 +113,8 @@ 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")
"multimodule": ("MULTIMODULE", "YES", "NO"),
"internalpxx1": ("INTERNAL_MODULE_PXX1", "NO", "YES"),
}
options_taranis_xlite = {
@ -144,6 +145,7 @@ 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 = {