Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-21 15:25:12 +03:00
Code Activity

Simplification for internal module types allowed

Browse source
This commit is contained in:
Bertrand Songis 2019-08-12 17:47:21 +02:00
parent 3bd9e3a2f7
commit 842f1c6ed9
4 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -565,25 +565,23 @@ bool isInternalModuleAvailable(int moduleType)
if (moduleType == MODULE_TYPE_NONE) if (moduleType == MODULE_TYPE_NONE)
return true; return true;
#if defined(PXX2) && defined(INTERNAL_MODULE_PXX1) if (moduleType == MODULE_TYPE_XJT_PXX1) {
if (moduleType == MODULE_TYPE_XJT_PXX1) #if defined(PXX1) && defined(INTERNAL_MODULE_PXX1)
return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); 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
if (moduleType == MODULE_TYPE_XJT_PXX1)
return false;
#endif #endif
}
#if defined(PXX2) && !defined(INTERNAL_MODULE_PXX1) if (moduleType == MODULE_TYPE_ISRM_PXX2) {
if (moduleType == MODULE_TYPE_ISRM_PXX2) #if defined(PXX2) && defined(INTERNAL_MODULE_PXX2)
#if defined(INTMODULE_USART)
return true; return true;
#else
return (!isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type));
#endif #endif
}
if (moduleType == MODULE_TYPE_PPM) {
#if defined(PPM) && defined(INTERNAL_MODULE_PPM)
return true;
#endif #endif
}
return false; return false;
} }

10
radio/src/targets/horus/CMakeLists.txt
View file

@ -2,6 +2,8 @@ option(DISK_CACHE "Enable SD card disk cache" YES)
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES) option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES)
option(PXX1 "PXX1 protocol support" ON) option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" OFF) option(PXX2 "PXX2 protocol support" OFF)
option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)") set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(CPU_TYPE STM32F4) set(CPU_TYPE STM32F4)
@ -171,3 +173,11 @@ if(PYTHONINTERP_FOUND)
DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py DEPENDS ${RADIO_DIRECTORY}/src/datastructs.h ${RADIO_DIRECTORY}/util/generate_datacopy.py
) )
endif() endif()
if(INTERNAL_MODULE_PXX1)
add_definitions(-DINTERNAL_MODULE_PXX1)
endif()
if(INTERNAL_MODULE_PXX2)
add_definitions(-DINTERNAL_MODULE_PXX2)
endif()

1
radio/src/targets/horus/board.h
View file

@ -131,7 +131,6 @@ void SDRAM_Init(void);
#define EXTERNAL_MODULE_OFF() GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) #define EXTERNAL_MODULE_OFF() GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN)
#define IS_INTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN) == Bit_SET) #define IS_INTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(INTMODULE_PWR_GPIO, INTMODULE_PWR_GPIO_PIN) == Bit_SET)
#define IS_EXTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) == Bit_SET) #define IS_EXTERNAL_MODULE_ON() (GPIO_ReadInputDataBit(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) == Bit_SET)
#define INTERNAL_MODULE_PXX1
#if !defined(PXX2) #if !defined(PXX2)
#define IS_PXX2_INTERNAL_ENABLED() (false) #define IS_PXX2_INTERNAL_ENABLED() (false)

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

@ -907,7 +907,9 @@
#if !defined(RADIO_T12) #if !defined(RADIO_T12)
#define HARDWARE_INTERNAL_MODULE #define HARDWARE_INTERNAL_MODULE
#endif #endif
#if !defined(PCBXLITES) && !defined(PCBX9LITE) && !(defined(PCBX9DP) && PCBREV >= 2019) #if defined(PCBXLITES) || defined(PCBX9LITE) || (defined(PCBX9DP) && PCBREV >= 2019)
#define INTERNAL_MODULE_PXX2
#else
#define INTERNAL_MODULE_PXX1 #define INTERNAL_MODULE_PXX1
#endif #endif
#define INTMODULE_FLASH_BAUDRATE 57600 #define INTMODULE_FLASH_BAUDRATE 57600