piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

R9M and R9M2

Browse Source
This commit is contained in:
3djc
2019-02-19 13:15:54 +01:00
parent 66a4276fb3
commit d80dc67bbd
20 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common_arm.cpp
+13 -1
View File
@@ -520,7 +520,7 @@ bool isInternalModuleAvailable(int module)
if (module == MODULE_TYPE_NONE)
return true;
if (module == (IS_PXX2_INTERNAL_ENABLED() ? MODULE_TYPE_XJT2 : MODULE_TYPE_XJT))
if ((module == (IS_PXX2_INTERNAL_ENABLED() ? MODULE_TYPE_XJT2 : MODULE_TYPE_XJT)) && !isModulePXX2(EXTERNAL_MODULE))
return true;
return false;
@@ -561,6 +561,15 @@ bool isExternalModuleAvailable(int module)
if (module == MODULE_TYPE_R9M && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
return false;
}
if (module == MODULE_TYPE_R9M2 && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
return false;
}
if (module == MODULE_TYPE_XJT && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
return false;
}
if (module == MODULE_TYPE_XJT2 && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
return false;
}
#endif
return true;
@@ -582,6 +591,9 @@ bool isRfProtocolAvailable(int protocol)
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M) {
return false;
}
if (protocol != RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M2) {
return false;
}
#endif
return true;