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

[GUI] Module choice fixes

Browse Source
This commit is contained in:
Bertrand Songis
2019-03-12 14:55:33 +01:00
parent 7e213cc787
commit 9deaa04a71
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common_arm.cpp
+11 -4
View File
@@ -530,8 +530,15 @@ bool isInternalModuleAvailable(int module)
if (module == MODULE_TYPE_NONE)
return true;
if ((module == (IS_PXX2_INTERNAL_ENABLED() ? MODULE_TYPE_XJT2 : MODULE_TYPE_XJT)) && !isModulePXX2(EXTERNAL_MODULE))
#if defined(PXX1)
if (module == MODULE_TYPE_XJT)
return !isModulePXX(EXTERNAL_MODULE);
#endif
#if defined(PXX2)
if (module == MODULE_TYPE_XJT2)
return true;
#endif
return false;
}
@@ -539,7 +546,7 @@ bool isInternalModuleAvailable(int module)
bool isExternalModuleAvailable(int module)
{
#if !defined(PXX1)
if (module == MODULE_TYPE_XJT) {
if (module == MODULE_TYPE_XJT || module == MODULE_TYPE_R9M) {
return false;
}
#endif
@@ -568,10 +575,10 @@ bool isExternalModuleAvailable(int module)
}
#endif
#if defined(PCBTARANIS) || defined(PCBHORUS)
if (module == MODULE_TYPE_R9M && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
if (module == MODULE_TYPE_R9M && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT) {
return false;
}
if (module == MODULE_TYPE_XJT && g_model.moduleData[INTERNAL_MODULE].type != MODULE_TYPE_NONE) {
if (module == MODULE_TYPE_XJT && g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_XJT) {
return false;
}
#endif
radio/src/pulses/modules.h
+1 -1
View File
@@ -174,7 +174,7 @@ inline bool isModuleR9M_AU_PLUS(uint8_t idx)
inline bool isModulePXX(uint8_t idx)
{
return isModuleXJT(idx);
return isModuleXJT(idx) || isModuleR9M(idx);
}
inline bool isModulePXX2(uint8_t idx)