From fdc154c5ae3a6679b77e926235c5971f74731814 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 6 Dec 2019 16:38:12 +0100 Subject: [PATCH] Use PROTOCOL_TELEMETRY_MULTIMODULE for internal multi when available (#7147) * Use PROTOCOL_TELEMETRY_MULTIMODULE for internal multi when available * Fix subprotocol sometime not shown This fixes #7153 --- radio/src/gui/480x272/model_setup.cpp | 2 +- radio/src/telemetry/telemetry.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 8f7c17ab9..c34dab101 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -1072,7 +1072,7 @@ bool menuModelSetup(event_t event) else if (isModuleMultimodule(moduleIdx)) { int multi_rfProto = g_model.moduleData[moduleIdx].getMultiProtocol(); lcdDrawMultiProtocolString(MODEL_SETUP_3RD_COLUMN, y, moduleIdx, multi_rfProto, menuHorizontalPosition == 1 ? attr : 0); - if (MULTIMODULE_HAS_SUBTYPE(EXTERNAL_MODULE)) + if (MULTIMODULE_HAS_SUBTYPE(moduleIdx)) lcdDrawMultiSubProtocolString(MODEL_SETUP_4TH_COLUMN, y, moduleIdx, g_model.moduleData[moduleIdx].subType, menuHorizontalPosition==2 ? attr : 0); } #endif diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 8b5aadc67..0c0a1c969 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -147,6 +147,11 @@ inline uint8_t modelTelemetryProtocol() if (!sportUsed && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE) { return PROTOCOL_TELEMETRY_MULTIMODULE; } +#if defined(INTERNAL_MODULE_MULTI) + if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE) { + return PROTOCOL_TELEMETRY_MULTIMODULE; + } +#endif #endif // default choice return PROTOCOL_TELEMETRY_FRSKY_SPORT;