Bsongis/wizard issue when model id already used (#7259)

Wizard: popup displayed when modelID already used, but screen not refreshed
This commit is contained in:
Bertrand Songis
2020-01-03 11:54:21 +01:00
committed by GitHub
parent 655ac5773d
commit ef49a9ff77
7 changed files with 60 additions and 89 deletions
+4 -3
View File
@@ -416,14 +416,15 @@ inline bool isModuleBindRangeAvailable(uint8_t moduleIdx)
return isModulePXX2(moduleIdx) || isModulePXX1(moduleIdx) || isModuleDSM2(moduleIdx) || isModuleMultimodule(moduleIdx);
}
constexpr uint8_t MAX_RXNUM = 63;
inline uint8_t getMaxRxNum(uint8_t idx)
{
if (isModuleDSM2(idx))
return 20;
#if defined(MULTIMODULE)
if (isModuleMultimodule(idx))
{
if (isModuleMultimodule(idx)) {
switch (g_model.moduleData[idx].getMultiProtocol()) {
case MODULE_SUBTYPE_MULTI_OLRS:
return 4;
@@ -434,7 +435,7 @@ inline uint8_t getMaxRxNum(uint8_t idx)
}
#endif
return 63;
return MAX_RXNUM;
}
inline const char * getModuleDelay(uint8_t idx)