From b0c0b5110c0074b0d587ee01a53a49dfb4a4946a Mon Sep 17 00:00:00 2001 From: OptimusTi Date: Tue, 8 Sep 2020 23:03:39 -0400 Subject: [PATCH] Update to SNR This update hides the SNR and dB symbols when not in use and shows a preview inside the CMS. --- src/main/io/osd.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/io/osd.c b/src/main/io/osd.c index 8513ed5bb9..d7a7aa682b 100755 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -1660,16 +1660,21 @@ static bool osdDrawSingleElement(uint8_t item) break; case OSD_CRSF_SNR_DB: { - const char* hidesnr = " "; + const char* showsnr = " -12"; + const char* hidesnr = " "; int16_t osdSNR_Alarm = rxLinkStatistics.uplinkSNR; if (osdSNR_Alarm <= osdConfig()->snr_alarm) { buff[0] = SYM_SRN; tfp_sprintf(buff + 1, "%4d%c", rxLinkStatistics.uplinkSNR, SYM_DB); } else if (osdSNR_Alarm > osdConfig()->snr_alarm) { - //displayWrite(osdDisplayPort, elemPosX, elemPosY, " "); - buff[0] = SYM_SRN; - tfp_sprintf(buff + 1, "%s%c", hidesnr, SYM_DB); + if (cmsInMenu) { + buff[0] = SYM_SRN; + tfp_sprintf(buff + 1, "%s%c", showsnr, SYM_DB); + } else { + buff[0] = SYM_BLANK; + tfp_sprintf(buff + 1, "%s%c", hidesnr); + } } break; } @@ -3223,7 +3228,7 @@ void osdUpdate(timeUs_t currentTimeUs) else #ifdef USE_PROGRAMMING_FRAMEWORK if (LOGIC_CONDITION_GLOBAL_FLAG(LOGIC_CONDITION_GLOBAL_FLAG_OVERRIDE_OSD_LAYOUT)) - activeLayout = constrain(logicConditionValuesByType[LOGIC_CONDITION_SET_OSD_LAYOUT], 0, OSD_ALTERNATE_LAYOUT_COUNT); + activeLayout = constrain(logicConditionValuesByType[LOGIC_CONDITION_SET_OSD_LAYOUT], 0, OSD_ALTERNATE_LAYOUT_COUNT); else #endif activeLayout = 0;