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

Add units symbol to the vario OSD element

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2019-06-12 16:26:20 +02:00
parent ee564432f6
commit ef74357faf
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/drivers/max7456_symbols.h
View file

@ -136,6 +136,8 @@
#define SYM_SPEED 0x70 #define SYM_SPEED 0x70
#define SYM_KPH 0x9E #define SYM_KPH 0x9E
#define SYM_MPH 0x9D #define SYM_MPH 0x9D
#define SYM_MPS 0x9F
#define SYM_FTPS 0x99
// Menu cursor // Menu cursor
#define SYM_CURSOR SYM_AH_LEFT #define SYM_CURSOR SYM_AH_LEFT

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

@ -425,6 +425,16 @@ char osdGetSpeedToSelectedUnitSymbol(void)
} }
} }
char osdGetVarioToSelectedUnitSymbol(void)
{
switch (osdConfig()->units) {
case OSD_UNIT_IMPERIAL:
return SYM_FTPS;
default:
return SYM_MPS;
}
}
#if defined(USE_ADC_INTERNAL) || defined(USE_ESC_SENSOR) #if defined(USE_ADC_INTERNAL) || defined(USE_ESC_SENSOR)
char osdGetTemperatureSymbolForSelectedUnit(void) char osdGetTemperatureSymbolForSelectedUnit(void)
{ {
@ -937,7 +947,7 @@ static void osdElementNumericalVario(osdElementParms_t *element)
if (haveBaro || haveGps) { if (haveBaro || haveGps) {
const int verticalSpeed = osdGetMetersToSelectedUnit(getEstimatedVario()); const int verticalSpeed = osdGetMetersToSelectedUnit(getEstimatedVario());
const char directionSymbol = verticalSpeed < 0 ? SYM_ARROW_SOUTH : SYM_ARROW_NORTH; const char directionSymbol = verticalSpeed < 0 ? SYM_ARROW_SOUTH : SYM_ARROW_NORTH;
tfp_sprintf(element->buff, "%c%01d.%01d", directionSymbol, abs(verticalSpeed / 100), abs((verticalSpeed % 100) / 10)); tfp_sprintf(element->buff, "%c%01d.%01d%c", directionSymbol, abs(verticalSpeed / 100), abs((verticalSpeed % 100) / 10), osdGetVarioToSelectedUnitSymbol());
} else { } else {
// We use this symbol when we don't have a valid measure // We use this symbol when we don't have a valid measure
element->buff[0] = SYM_COLON; element->buff[0] = SYM_COLON;