Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Made temperature OSD display consistent.

Browse source
This commit is contained in:
mikeller 2019-05-04 17:13:06 +12:00
parent 686c075234
commit 05f5449d04
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/osd/osd_elements.c
View file

@ -530,7 +530,7 @@ static void osdElementCompassBar(osdElementParms_t *element)
#ifdef USE_ADC_INTERNAL #ifdef USE_ADC_INTERNAL
static void osdElementCoreTemperature(osdElementParms_t *element) 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 #endif // USE_ADC_INTERNAL
@ -651,7 +651,7 @@ static void osdElementDisplayName(osdElementParms_t *element)
static void osdElementEscTemperature(osdElementParms_t *element) static void osdElementEscTemperature(osdElementParms_t *element)
{ {
if (featureIsEnabled(FEATURE_ESC_SENSOR)) { 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 #endif // USE_ESC_SENSOR
@ -1179,7 +1179,7 @@ static void osdElementWarnings(osdElementParms_t *element)
const int16_t coreTemperature = getCoreTemperatureCelsius(); const int16_t coreTemperature = getCoreTemperatureCelsius();
if (osdWarnGetState(OSD_WARNING_CORE_TEMPERATURE) && coreTemperature >= osdConfig()->core_temp_alarm) { if (osdWarnGetState(OSD_WARNING_CORE_TEMPERATURE) && coreTemperature >= osdConfig()->core_temp_alarm) {
char coreTemperatureWarningMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE]; 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); osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, coreTemperatureWarningMsg);
SET_BLINK(OSD_WARNINGS); SET_BLINK(OSD_WARNINGS);

6
src/test/unit/osd_unittest.cc
View file

@ -826,7 +826,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, "%c 0%c", SYM_TEMPERATURE, SYM_C); displayPortTestBufferSubstring(1, 8, "C%c 0%c", SYM_TEMPERATURE, SYM_C);
// given // given
simulationCoreTemperature = 33; simulationCoreTemperature = 33;
@ -836,7 +836,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, "%c 33%c", SYM_TEMPERATURE, SYM_C); displayPortTestBufferSubstring(1, 8, "C%c 33%c", SYM_TEMPERATURE, SYM_C);
// given // given
osdConfigMutable()->units = OSD_UNIT_IMPERIAL; osdConfigMutable()->units = OSD_UNIT_IMPERIAL;
@ -846,7 +846,7 @@ TEST(OsdTest, TestElementCoreTemperature)
osdRefresh(simulationTime); osdRefresh(simulationTime);
// then // then
displayPortTestBufferSubstring(1, 8, "%c 91%c", SYM_TEMPERATURE, SYM_F); displayPortTestBufferSubstring(1, 8, "C%c 91%c", SYM_TEMPERATURE, SYM_F);
} }
/* /*