Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2020-03-18 17:09:38 +01:00
52 changed files with 514 additions and 295 deletions
+1 -1
View File
@@ -153,7 +153,7 @@ inline uint8_t modelTelemetryProtocol()
return PROTOCOL_TELEMETRY_MULTIMODULE;
}
#if defined(INTERNAL_MODULE_MULTI)
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE) {
if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
return PROTOCOL_TELEMETRY_MULTIMODULE;
}
#endif