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

Renaming PXX / ACCESS modules constants

Browse source
This commit is contained in:
Bertrand Songis 2019-05-10 23:06:48 +02:00
parent 6b032184d7
commit e77b096463
17 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -545,11 +545,11 @@ bool isModuleUSingSport(uint8_t moduleBay, uint8_t moduleType)
case MODULE_TYPE_PPM:
case MODULE_TYPE_DSM2:
case MODULE_TYPE_MULTIMODULE:
case MODULE_TYPE_R9M_LITE2:
case MODULE_TYPE_R9M_LITE_PRO2:
case MODULE_TYPE_ACCESS_R9M_LITE:
case MODULE_TYPE_ACCESS_R9M_LITE_PRO:
return false;
case MODULE_TYPE_XJT2:
case MODULE_TYPE_ACCESS_ISRM:
if (moduleBay == EXTERNAL_MODULE)
return false;
@ -569,7 +569,7 @@ bool isInternalModuleAvailable(int moduleType)
return true;
#if defined(PXX1)
if (moduleType == MODULE_TYPE_XJT)
if (moduleType == MODULE_TYPE_PXX_XJT)
#if defined(INTMODULE_NO_PXX1)
return false;
#else
@ -578,7 +578,7 @@ bool isInternalModuleAvailable(int moduleType)
#endif
#if defined(PXX2)
if (moduleType == MODULE_TYPE_XJT2)
if (moduleType == MODULE_TYPE_ACCESS_ISRM)
#if defined(INTMODULE_USART)
return true;
#else
@ -593,17 +593,17 @@ bool isInternalModuleAvailable(int moduleType)
bool isExternalModuleAvailable(int moduleType)
{
#if !defined(PCBXLITE)
if (moduleType == MODULE_TYPE_R9M_LITE || moduleType == MODULE_TYPE_R9M_LITE2 || moduleType == MODULE_TYPE_R9M_LITE_PRO2) {
if (moduleType == MODULE_TYPE_PXX_R9M_LITE || moduleType == MODULE_TYPE_ACCESS_R9M_LITE || moduleType == MODULE_TYPE_ACCESS_R9M_LITE_PRO) {
return false;
}
#endif
#if !defined(PXX1)
if (moduleType == MODULE_TYPE_XJT || moduleType == MODULE_TYPE_R9M || moduleType == MODULE_TYPE_R9M_LITE) {
if (moduleType == MODULE_TYPE_PXX_XJT || moduleType == MODULE_TYPE_PXX_R9M || moduleType == MODULE_TYPE_PXX_R9M_LITE) {
return false;
}
#endif
#if !defined(PXX2)
if (moduleType == MODULE_TYPE_XJT2 || moduleType == MODULE_TYPE_R9M2 || moduleType == MODULE_TYPE_R9M_LITE2 || moduleType == MODULE_TYPE_R9M_LITE_PRO2) {
if (moduleType == MODULE_TYPE_ACCESS_ISRM || moduleType == MODULE_TYPE_ACCESS_R9M || moduleType == MODULE_TYPE_ACCESS_R9M_LITE || moduleType == MODULE_TYPE_ACCESS_R9M_LITE_PRO) {
return false;
}
#endif
@ -647,10 +647,10 @@ bool isRfProtocolAvailable(int protocol)
}
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M) {
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX_R9M) {
return false;
}
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M2) {
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_ACCESS_R9M) {
return false;
}
#endif