From ba99bdae212ea96991f4a3984a2aa2148e39ecb1 Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Mon, 3 Jun 2019 08:44:45 +0200 Subject: [PATCH 1/2] Remove second symbol in the Throttle OSD element --- src/main/drivers/max7456_symbols.h | 2 +- src/main/osd/osd_elements.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/drivers/max7456_symbols.h b/src/main/drivers/max7456_symbols.h index 0250381c8e..049e5543c3 100644 --- a/src/main/drivers/max7456_symbols.h +++ b/src/main/drivers/max7456_symbols.h @@ -35,13 +35,13 @@ #define SYM_LON 0x98 #define SYM_ALTITUDE 0x7F #define SYM_TOTAL_DISTANCE 0x71 +#define SYM_TRIANGLE 0x05 // RSSI #define SYM_RSSI 0x01 // Throttle Position (%) #define SYM_THR 0x04 -#define SYM_THR1 0x05 // Map mode #define SYM_HOME 0x04 diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index eca7bc8670..dda2c736a0 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -791,7 +791,7 @@ static void osdElementGpsHomeDirection(osdElementParms_t *element) element->buff[0] = osdGetDirectionSymbolFromHeading(h); } else { // We don't have a HOME symbol in the font, by now we use this - element->buff[0] = SYM_THR1; + element->buff[0] = SYM_TRIANGLE; } } else { @@ -1076,9 +1076,7 @@ static void osdElementStickOverlay(osdElementParms_t *element) static void osdElementThrottlePosition(osdElementParms_t *element) { - element->buff[0] = SYM_THR; - element->buff[1] = SYM_THR1; - tfp_sprintf(element->buff + 2, "%3d", calculateThrottlePercent()); + tfp_sprintf(element->buff, "%c%3d", SYM_THR, calculateThrottlePercent()); } static void osdElementTimer(osdElementParms_t *element) From 97d87bd16b52bf00c5e49ca52f9b3f09881daa07 Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Mon, 3 Jun 2019 11:39:48 +0200 Subject: [PATCH 2/2] Change the home symbol to free the triangle character in OSD --- src/main/drivers/max7456_symbols.h | 1 - src/main/osd/osd_elements.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/drivers/max7456_symbols.h b/src/main/drivers/max7456_symbols.h index 049e5543c3..3adda883ae 100644 --- a/src/main/drivers/max7456_symbols.h +++ b/src/main/drivers/max7456_symbols.h @@ -35,7 +35,6 @@ #define SYM_LON 0x98 #define SYM_ALTITUDE 0x7F #define SYM_TOTAL_DISTANCE 0x71 -#define SYM_TRIANGLE 0x05 // RSSI #define SYM_RSSI 0x01 diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index dda2c736a0..ec46b00186 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -790,8 +790,8 @@ static void osdElementGpsHomeDirection(osdElementParms_t *element) const int h = GPS_directionToHome - DECIDEGREES_TO_DEGREES(attitude.values.yaw); element->buff[0] = osdGetDirectionSymbolFromHeading(h); } else { - // We don't have a HOME symbol in the font, by now we use this - element->buff[0] = SYM_TRIANGLE; + // We use this symbol when we are at HOME position + element->buff[0] = '#'; } } else {