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

Module names constants / strings changed again

Browse source
This commit is contained in:
Bertrand Songis 2019-05-28 16:05:25 +02:00
parent 780579054f
commit 8d0be6b748
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
18 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -555,11 +555,11 @@ bool isModuleUSingSport(uint8_t moduleBay, uint8_t moduleType)
case MODULE_TYPE_PPM:
case MODULE_TYPE_DSM2:
case MODULE_TYPE_MULTIMODULE:
case MODULE_TYPE_PXX2_R9M_LITE:
case MODULE_TYPE_PXX2_R9M_LITE_PRO:
case MODULE_TYPE_R9M_LITE_PXX2:
case MODULE_TYPE_R9M_LITE_PRO_PXX2:
return false;
case MODULE_TYPE_PXX2_ISRM:
case MODULE_TYPE_ISRM_PXX2:
if (moduleBay == EXTERNAL_MODULE)
return false;
@ -579,15 +579,15 @@ bool isInternalModuleAvailable(int moduleType)
return true;
#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1)
if (moduleType == MODULE_TYPE_PXX1_XJT)
if (moduleType == MODULE_TYPE_XJT_PXX1)
return !isModuleUSingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
#else
if (moduleType == MODULE_TYPE_PXX1_XJT)
if (moduleType == MODULE_TYPE_XJT_PXX1)
return false;
#endif
#if defined(PXX2)
if (moduleType == MODULE_TYPE_PXX2_ISRM)
if (moduleType == MODULE_TYPE_ISRM_PXX2)
#if defined(INTMODULE_USART)
return true;
#else
@ -602,30 +602,30 @@ bool isInternalModuleAvailable(int moduleType)
bool isExternalModuleAvailable(int moduleType)
{
#if !defined(PCBXLITE) && !defined(PCBX9LITE)
if (moduleType == MODULE_TYPE_PXX1_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE_PRO)
if (moduleType == MODULE_TYPE_R9M_LITE_PXX1 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2)
return false;
#endif
#if !defined(PXX1)
if (moduleType == MODULE_TYPE_PXX1_XJT || moduleType == MODULE_TYPE_PXX1_R9M || moduleType == MODULE_TYPE_PXX1_R9M_LITE)
if (moduleType == MODULE_TYPE_XJT_PXX1 || moduleType == MODULE_TYPE_R9M_PXX1 || moduleType == MODULE_TYPE_R9M_LITE_PXX1)
return false;
#endif
#if !defined(XJT)
if (moduleType == MODULE_TYPE_PXX1_XJT)
if (moduleType == MODULE_TYPE_XJT_PXX1)
return false;
#endif
#if !defined(R9M_SIZE_STD)
if (moduleType == MODULE_TYPE_PXX1_R9M)
if (moduleType == MODULE_TYPE_R9M_PXX1)
return false;
#endif
if (moduleType == MODULE_TYPE_PXX2_ISRM || moduleType == MODULE_TYPE_PXX2_R9M)
if (moduleType == MODULE_TYPE_ISRM_PXX2 || moduleType == MODULE_TYPE_R9M_PXX2)
return false;
#if !defined(PXX2)
if (moduleType == MODULE_TYPE_PXX2_R9M || moduleType == MODULE_TYPE_PXX2_R9M_LITE || moduleType == MODULE_TYPE_PXX2_R9M_LITE_PRO) {
if (moduleType == MODULE_TYPE_R9M_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PXX2 || moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
return false;
}
#endif
@ -676,10 +676,10 @@ bool isRfProtocolAvailable(int protocol)
}
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX1_R9M) {
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX1) {
return false;
}
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PXX2_R9M) {
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX2) {
return false;
}
#endif