piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Ghost is using LQY for RSSI (#8085)

Browse Source 
* Ghost is using LQY for RSSI
This commit is contained in:
3djc
2020-11-14 14:57:57 +01:00
committed by GitHub
parent 4c96dbad4e
commit 27e19552c6
4 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_telemetry.cpp
+1 -8
View File
@@ -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: {
radio/src/gui/212x64/model_telemetry.cpp
+1 -8
View File
@@ -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: {
radio/src/gui/480x272/model_telemetry.cpp
+1 -8
View File
@@ -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: {
radio/src/pulses/modules_helpers.h
+16
View File
@@ -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_