From 05f5449d049ad4fa0e5a1d010a33d8b6616a2bb7 Mon Sep 17 00:00:00 2001 From: mikeller Date: Sat, 4 May 2019 17:13:06 +1200 Subject: [PATCH] Made temperature OSD display consistent. --- src/main/osd/osd_elements.c | 6 +++--- src/test/unit/osd_unittest.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index 8a4b6fb918..b594906584 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -530,7 +530,7 @@ static void osdElementCompassBar(osdElementParms_t *element) #ifdef USE_ADC_INTERNAL static void osdElementCoreTemperature(osdElementParms_t *element) { - tfp_sprintf(element->buff, "%c%3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(getCoreTemperatureCelsius()), osdGetTemperatureSymbolForSelectedUnit()); + tfp_sprintf(element->buff, "C%c%3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(getCoreTemperatureCelsius()), osdGetTemperatureSymbolForSelectedUnit()); } #endif // USE_ADC_INTERNAL @@ -651,7 +651,7 @@ static void osdElementDisplayName(osdElementParms_t *element) static void osdElementEscTemperature(osdElementParms_t *element) { if (featureIsEnabled(FEATURE_ESC_SENSOR)) { - tfp_sprintf(element->buff, "%3d%c", osdConvertTemperatureToSelectedUnit(osdEscDataCombined->temperature), osdGetTemperatureSymbolForSelectedUnit()); + tfp_sprintf(element->buff, "E%c%3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(osdEscDataCombined->temperature), osdGetTemperatureSymbolForSelectedUnit()); } } #endif // USE_ESC_SENSOR @@ -1179,7 +1179,7 @@ static void osdElementWarnings(osdElementParms_t *element) const int16_t coreTemperature = getCoreTemperatureCelsius(); if (osdWarnGetState(OSD_WARNING_CORE_TEMPERATURE) && coreTemperature >= osdConfig()->core_temp_alarm) { char coreTemperatureWarningMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE]; - tfp_sprintf(coreTemperatureWarningMsg, "CORE: %3d%c", osdConvertTemperatureToSelectedUnit(coreTemperature), osdGetTemperatureSymbolForSelectedUnit()); + tfp_sprintf(coreTemperatureWarningMsg, "CORE %c: %3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(coreTemperature), osdGetTemperatureSymbolForSelectedUnit()); osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, coreTemperatureWarningMsg); SET_BLINK(OSD_WARNINGS); diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc index 93ea2c3ab4..22cde66cdc 100644 --- a/src/test/unit/osd_unittest.cc +++ b/src/test/unit/osd_unittest.cc @@ -826,7 +826,7 @@ TEST(OsdTest, TestElementCoreTemperature) osdRefresh(simulationTime); // then - displayPortTestBufferSubstring(1, 8, "%c 0%c", SYM_TEMPERATURE, SYM_C); + displayPortTestBufferSubstring(1, 8, "C%c 0%c", SYM_TEMPERATURE, SYM_C); // given simulationCoreTemperature = 33; @@ -836,7 +836,7 @@ TEST(OsdTest, TestElementCoreTemperature) osdRefresh(simulationTime); // then - displayPortTestBufferSubstring(1, 8, "%c 33%c", SYM_TEMPERATURE, SYM_C); + displayPortTestBufferSubstring(1, 8, "C%c 33%c", SYM_TEMPERATURE, SYM_C); // given osdConfigMutable()->units = OSD_UNIT_IMPERIAL; @@ -846,7 +846,7 @@ TEST(OsdTest, TestElementCoreTemperature) osdRefresh(simulationTime); // then - displayPortTestBufferSubstring(1, 8, "%c 91%c", SYM_TEMPERATURE, SYM_F); + displayPortTestBufferSubstring(1, 8, "C%c 91%c", SYM_TEMPERATURE, SYM_F); } /*