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

Prevent conflict with trainer on external module (#6846)

Browse source 
Prevent conflict with trainer on external module
This commit is contained in:
3djc 2019-10-01 15:01:21 +02:00
parent 7a0a6a9341
commit ab385d1bdb
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -536,6 +536,15 @@ bool isPxx2IsrmChannelsCountAllowed(int channels)
} }
#endif #endif
bool isTrainerUsingModuleBay()
{
#if defined(PCBTARANIS)
if (TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE <= g_model.trainerData.mode && g_model.trainerData.mode <= TRAINER_MODE_MASTER_BATTERY_COMPARTMENT)
return true;
#endif
return false;
}
bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType) bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType)
{ {
switch (moduleType) { switch (moduleType) {
@ -644,7 +653,7 @@ bool isExternalModuleAvailable(int moduleType)
#endif #endif
#if defined(HARDWARE_INTERNAL_MODULE) #if defined(HARDWARE_INTERNAL_MODULE)
if (isModuleUsingSport(EXTERNAL_MODULE, moduleType) && isModuleUsingSport(INTERNAL_MODULE, g_model.moduleData[INTERNAL_MODULE].type)) if ((isModuleUsingSport(EXTERNAL_MODULE, moduleType) || isTrainerUsingModuleBay()) && isModuleUsingSport(INTERNAL_MODULE, g_model.moduleData[INTERNAL_MODULE].type))
return false; return false;
#endif #endif

1
radio/src/gui/gui_common.h
View file

@ -62,6 +62,7 @@ bool isSwitchAvailableInTimers(int swtch);
bool isR9MModeAvailable(int mode); bool isR9MModeAvailable(int mode);
bool isPxx2IsrmChannelsCountAllowed(int channels); bool isPxx2IsrmChannelsCountAllowed(int channels);
bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType); bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType);
bool isTrainerUsingModuleBay();
bool isExternalModuleAvailable(int moduleType); bool isExternalModuleAvailable(int moduleType);
bool isInternalModuleAvailable(int moduleType); bool isInternalModuleAvailable(int moduleType);
bool isRfProtocolAvailable(int protocol); bool isRfProtocolAvailable(int protocol);