Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2020-01-14 17:34:13 +01:00
21 changed files with 170 additions and 105 deletions
+6 -1
View File
@@ -372,6 +372,11 @@ inline int8_t defaultModuleChannels_M8(uint8_t idx)
return maxModuleChannels_M8(idx);
}
inline uint8_t sentModulePXXChannels(uint8_t idx)
{
return 8 + g_model.moduleData[idx].channelsCount;
}
inline int8_t sentModuleChannels(uint8_t idx)
{
if (isModuleCrossfire(idx))
@@ -381,7 +386,7 @@ inline int8_t sentModuleChannels(uint8_t idx)
else if (isModuleSBUS(idx))
return 16;
else
return 8 + g_model.moduleData[idx].channelsCount;
return sentModulePXXChannels(idx);
}
inline bool isDefaultModelRegistrationID()