rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use the new Speed and Total Distance OSD symbols

This commit is contained in:
Miguel Angel Mulero Martinez 2019-05-27 20:01:03 +02:00
parent 662b66e91c
commit 1dc7cd24ba
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
#define SYM_LAT 0x89 #define SYM_LAT 0x89
#define SYM_LON 0x98 #define SYM_LON 0x98
#define SYM_ALTITUDE 0x7F #define SYM_ALTITUDE 0x7F
#define SYM_TOTAL_DISTANCE 0x71
// RSSI // RSSI
#define SYM_RSSI 0x01 #define SYM_RSSI 0x01
@ -134,6 +135,7 @@
#define SYM_FLY_M 0x9C #define SYM_FLY_M 0x9C
// Speed // Speed
#define SYM_SPEED 0x70
#define SYM_KPH 0x9E #define SYM_KPH 0x9E
#define SYM_MPH 0x9D #define SYM_MPH 0x9D

9
src/main/osd/osd_elements.c
View File

@ -776,13 +776,10 @@ static void osdElementGpsFlightDistance(osdElementParms_t *element)
{ {
if (STATE(GPS_FIX) && STATE(GPS_FIX_HOME)) { if (STATE(GPS_FIX) && STATE(GPS_FIX_HOME)) {
const int32_t distance = osdGetMetersToSelectedUnit(GPS_distanceFlownInCm / 100); const int32_t distance = osdGetMetersToSelectedUnit(GPS_distanceFlownInCm / 100);
tfp_sprintf(element->buff, "%d%c", distance, osdGetMetersToSelectedUnitSymbol()); tfp_sprintf(element->buff, "%c%d%c", SYM_TOTAL_DISTANCE, distance, osdGetMetersToSelectedUnitSymbol());
} else { } else {
// We use this symbol when we don't have a FIX // We use this symbol when we don't have a FIX
element->buff[0] = SYM_COLON; tfp_sprintf(element->buff, "%c%c", SYM_TOTAL_DISTANCE, SYM_COLON);
// overwrite any previous distance with blanks
memset(element->buff + 1, SYM_BLANK, 6);
element->buff[7] = '\0';
} }
} }
@ -835,7 +832,7 @@ static void osdElementGpsSats(osdElementParms_t *element)
static void osdElementGpsSpeed(osdElementParms_t *element) static void osdElementGpsSpeed(osdElementParms_t *element)
{ {
tfp_sprintf(element->buff, "%3d%c", osdGetSpeedToSelectedUnit(gpsSol.groundSpeed), osdGetSpeedToSelectedUnitSymbol()); tfp_sprintf(element->buff, "%c%d%c", SYM_SPEED, osdGetSpeedToSelectedUnit(gpsSol.groundSpeed), osdGetSpeedToSelectedUnitSymbol());
} }
#endif // USE_GPS #endif // USE_GPS