From 27e19552c64bc41c36c86d77551bfa0c1aa1eca4 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 14 Nov 2020 14:57:57 +0100 Subject: [PATCH] Ghost is using LQY for RSSI (#8085) * Ghost is using LQY for RSSI --- radio/src/gui/128x64/model_telemetry.cpp | 9 +-------- radio/src/gui/212x64/model_telemetry.cpp | 9 +-------- radio/src/gui/480x272/model_telemetry.cpp | 9 +-------- radio/src/pulses/modules_helpers.h | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 652b89c4f..3cc9c3e7e 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -236,14 +236,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_RSSI_LABEL: -#if defined(MULTIMODULE) - if (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_FS_AFHDS2A || g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_HOTT)) - lcdDrawTextAlignedLeft(y, "RQly"); - else - lcdDrawTextAlignedLeft(y, "RSSI"); -#else - lcdDrawTextAlignedLeft(y, "RSSI"); -#endif + lcdDrawTextAlignedLeft(y, getRssiLabel()); break; case ITEM_TELEMETRY_RSSI_SOURCE: { diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index 439c68f0b..033d1dbba 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -227,14 +227,7 @@ void menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_RSSI_LABEL: -#if defined(MULTIMODULE) - if (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_FS_AFHDS2A || g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_HOTT)) - lcdDrawTextAlignedLeft(y, "RQly"); - else - lcdDrawTextAlignedLeft(y, "RSSI"); -#else - lcdDrawTextAlignedLeft(y, "RSSI"); -#endif + lcdDrawTextAlignedLeft(y, getRssiLabel()); break; case ITEM_TELEMETRY_RSSI_SOURCE: { diff --git a/radio/src/gui/480x272/model_telemetry.cpp b/radio/src/gui/480x272/model_telemetry.cpp index 82138dff3..6454de138 100644 --- a/radio/src/gui/480x272/model_telemetry.cpp +++ b/radio/src/gui/480x272/model_telemetry.cpp @@ -217,14 +217,7 @@ bool menuModelTelemetry(event_t event) break; case ITEM_TELEMETRY_RSSI_LABEL: -#if defined(MULTIMODULE) - if (!IS_INTERNAL_MODULE_ON() && - g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && - (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_FS_AFHDS2A || g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_HOTT )) - lcdDrawText(MENUS_MARGIN_LEFT, y, "RQly"); - else -#endif - lcdDrawText(MENUS_MARGIN_LEFT, y, "RSSI"); + lcdDrawText(MENUS_MARGIN_LEFT, y, getRssiLabel(), 0); break; case ITEM_TELEMETRY_RSSI_SOURCE: { diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 01ca2fa49..2d1b0685c 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/radio/src/pulses/modules_helpers.h @@ -678,4 +678,20 @@ inline void getMultiOptionValues(int8_t multi_proto, int8_t & min, int8_t & max) } #endif +inline const char * getRssiLabel() +{ +#if defined(MULTIMODULE) + if (telemetryProtocol == PROTOCOL_TELEMETRY_MULTIMODULE && (g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_FS_AFHDS2A + || g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol() == MODULE_SUBTYPE_MULTI_HOTT)) { + return "RQly"; + } +#endif +#if defined(GHOST) + if (telemetryProtocol == PROTOCOL_TELEMETRY_GHOST) { + return "RQly"; + } +#endif + return "RSSI"; +} + #endif // _MODULES_HELPERS_H_