From 0bdf935fc17761e5a129ae256182b25c71433a56 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 12 Jan 2017 21:42:47 +0100 Subject: [PATCH] =?UTF-8?q?Only=20show=20telemetry=20selection=20if=20it?= =?UTF-8?q?=20is=20sensible=20to=20do=20(as=20on=20Taranis/=E2=80=A6=20(#4?= =?UTF-8?q?215)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Only show telemetry selection if it is sensible to do (as on Taranis/Horus) * Cosmetics --- radio/src/gui/128x64/model_telemetry.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index 2b578fc4f..d3b2e6c33 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -163,10 +163,18 @@ enum MenuModelTelemetryFrskyItems { #define VARIO_RANGE_ROWS (NAVIGATION_LINE_BY_LINE | 3) #endif + +#if defined (PCBTARANIS) + #define TELEMETRY_TYPE_SHOW_TELEMETRY (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW +#elif defined (CPUARM) + #define TELEMETRY_TYPE_SHOW_TELEMETRY (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) ? (uint8_t)0 : HIDDEN_ROW +#endif + + #if defined(REVX) - #define TELEMETRY_TYPE_ROWS 0, 0, + #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_SHOW_TELEMETRY, TELEMETRY_TYPE_SHOW_TELEMETRY, #elif defined(CPUARM) - #define TELEMETRY_TYPE_ROWS 0, + #define TELEMETRY_TYPE_ROWS TELEMETRY_TYPE_SHOW_TELEMETRY, #else #define TELEMETRY_TYPE_ROWS #endif @@ -550,7 +558,7 @@ void menuModelTelemetryFrsky(event_t event) g_model.telemetryProtocol = checkIncDec(event, g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, EE_MODEL, isTelemetryProtocolAvailable); } break; - + #if defined(REVX) case ITEM_TELEMETRY_INVERTED_SERIAL: ON_OFF_MENU_ITEM(g_model.moduleData[EXTERNAL_MODULE].invertedSerial, TELEM_COL2, y, STR_INVERTED_SERIAL, attr, event);