From 6d2f93a4bd576af1bff4f05246ec0fd250ac4937 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 6 Sep 2019 11:03:45 +0200 Subject: [PATCH] Fixes --- radio/src/gui/128x64/model_telemetry.cpp | 2 +- radio/src/gui/212x64/model_telemetry.cpp | 2 +- radio/src/gui/480x272/model_telemetry.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/model_telemetry.cpp b/radio/src/gui/128x64/model_telemetry.cpp index e883ea8cf..289c73bba 100644 --- a/radio/src/gui/128x64/model_telemetry.cpp +++ b/radio/src/gui/128x64/model_telemetry.cpp @@ -248,7 +248,7 @@ void menuModelTelemetry(event_t event) case ITEM_TELEMETRY_RSSI_SOURCE: { lcdDrawTextAlignedLeft(y, INDENT TR_SOURCE); if (g_model.rssiSource) { - drawSource(TELEM_COL2, y, g_model.rssiSource ? MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1) : 0, attr); + drawSource(TELEM_COL2, y, MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1), attr); TelemetrySensor * sensor = &g_model.telemetrySensors[g_model.rssiSource - 1]; lcdDrawText(lcdNextPos, y, " ", attr); drawReceiverName(lcdNextPos, y, sensor->frskyInstance.rxIndex >> 2, sensor->frskyInstance.rxIndex & 0x03, attr); diff --git a/radio/src/gui/212x64/model_telemetry.cpp b/radio/src/gui/212x64/model_telemetry.cpp index d96558047..ab170895f 100644 --- a/radio/src/gui/212x64/model_telemetry.cpp +++ b/radio/src/gui/212x64/model_telemetry.cpp @@ -239,7 +239,7 @@ void menuModelTelemetry(event_t event) case ITEM_TELEMETRY_RSSI_SOURCE: { lcdDrawTextAlignedLeft(y, INDENT TR_SOURCE); if (g_model.rssiSource) { - drawSource(TELEM_COL2, y, g_model.rssiSource ? MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1) : 0, attr); + drawSource(TELEM_COL2, y, MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1), attr); TelemetrySensor * sensor = &g_model.telemetrySensors[g_model.rssiSource - 1]; lcdDrawText(lcdNextPos, y, " ", attr); drawReceiverName(lcdNextPos, y, sensor->frskyInstance.rxIndex >> 2, sensor->frskyInstance.rxIndex & 0x03, attr); diff --git a/radio/src/gui/480x272/model_telemetry.cpp b/radio/src/gui/480x272/model_telemetry.cpp index db9281ae2..f0c5fe56d 100644 --- a/radio/src/gui/480x272/model_telemetry.cpp +++ b/radio/src/gui/480x272/model_telemetry.cpp @@ -228,15 +228,15 @@ bool menuModelTelemetry(event_t event) case ITEM_TELEMETRY_RSSI_SOURCE: { lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_SOURCE); - if(g_model.rssiSource) { - drawSource(TELEM_COL2, y, g_model.rssiSource ? MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1) : 0, attr); + if (g_model.rssiSource) { + drawSource(TELEM_COL2, y, MIXSRC_FIRST_TELEM + 3 * (g_model.rssiSource - 1), attr); TelemetrySensor * sensor = &g_model.telemetrySensors[g_model.rssiSource - 1]; lcdDrawText(lcdNextPos, y, " ", attr); drawReceiverName(lcdNextPos, y, sensor->frskyInstance.rxIndex >> 2, sensor->frskyInstance.rxIndex & 0x03, attr); } else { lcdDrawText(TELEM_COL2, y, STR_DEFAULT, attr); -w } + } if (attr) { g_model.rssiSource = checkIncDec(event, g_model.rssiSource, 0, MAX_TELEMETRY_SENSORS, EE_MODEL | NO_INCDEC_MARKS, isRssiSensorAvailable); }