From 3dedae18c369f93c9e8c1900c2d322978835d3da Mon Sep 17 00:00:00 2001 From: Marcelo Bezerra <23555060+mmosca@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:14:09 +0100 Subject: [PATCH] symbols now match bf font again. osd maps have been updated where it makes sense --- src/main/io/displayport_msp_dji_compat.c | 24 ++++++++++++++---------- src/main/io/dji_osd_symbols.h | 3 +++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/io/displayport_msp_dji_compat.c b/src/main/io/displayport_msp_dji_compat.c index 74805fa059..469980d78b 100644 --- a/src/main/io/displayport_msp_dji_compat.c +++ b/src/main/io/displayport_msp_dji_compat.c @@ -225,8 +225,9 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) return DJI_SYM_M; case SYM_TOTAL: - return DJI_SYM_FLY_H; -/* + return DJI_SYM_TOTAL_DISTANCE; + + /* case SYM_ALT_KM: return DJI_SYM_ALT_KM; @@ -249,6 +250,7 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) case SYM_DIST_NM: return DJI_SYM_DIST_NM; */ + case SYM_M: return DJI_SYM_M; @@ -319,11 +321,13 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) case SYM_BLANK: return DJI_SYM_BLANK; +/* case SYM_ON_H: return DJI_SYM_ON_H; case SYM_FLY_H: return DJI_SYM_FLY_H; +*/ case SYM_ON_M: return DJI_SYM_ON_M; @@ -480,13 +484,13 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) */ case SYM_AH_CH_LEFT: case SYM_AH_CH_AIRCRAFT1: - return DJI_SYM_CROSSHAIR_LEFT; + return DJI_SYM_AH_CENTER_LINE; case SYM_AH_CH_CENTER: case SYM_AH_CH_AIRCRAFT2: - return DJI_SYM_CROSSHAIR_CENTRE; + return DJI_SYM_AH_CENTER; case SYM_AH_CH_RIGHT: case SYM_AH_CH_AIRCRAFT3: - return DJI_SYM_CROSSHAIR_RIGHT; + return DJI_SYM_AH_CENTER_LINE_RIGHT; case SYM_AH_CH_AIRCRAFT0: case SYM_AH_CH_AIRCRAFT4: @@ -495,21 +499,21 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) case SYM_AH_CH_TYPE3: return DJI_SYM_NONE; case (SYM_AH_CH_TYPE3+1): - return DJI_SYM_SMALL_CROSSHAIR; + return DJI_SYM_AH_CENTER; case (SYM_AH_CH_TYPE3+2): return DJI_SYM_NONE; case SYM_AH_CH_TYPE4: return DJI_SYM_HYPHEN; case (SYM_AH_CH_TYPE4+1): - return DJI_SYM_SMALL_CROSSHAIR; + return DJI_SYM_AH_CENTER; case (SYM_AH_CH_TYPE4+2): return DJI_SYM_HYPHEN; case SYM_AH_CH_TYPE5: return DJI_SYM_STICK_OVERLAY_HORIZONTAL; case (SYM_AH_CH_TYPE5+1): - return DJI_SYM_SMALL_CROSSHAIR; + return DJI_SYM_AH_CENTER; case (SYM_AH_CH_TYPE5+2): return DJI_SYM_STICK_OVERLAY_HORIZONTAL; @@ -523,14 +527,14 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page) case SYM_AH_CH_TYPE7: return DJI_SYM_ARROW_SMALL_LEFT; case (SYM_AH_CH_TYPE7+1): - return DJI_SYM_SMALL_CROSSHAIR; + return DJI_SYM_AH_CENTER; case (SYM_AH_CH_TYPE7+2): return DJI_SYM_ARROW_SMALL_RIGHT; case SYM_AH_CH_TYPE8: return DJI_SYM_AH_LEFT; case (SYM_AH_CH_TYPE8+1): - return DJI_SYM_SMALL_CROSSHAIR; + return DJI_SYM_AH_CENTER; case (SYM_AH_CH_TYPE8+2): return DJI_SYM_AH_RIGHT; diff --git a/src/main/io/dji_osd_symbols.h b/src/main/io/dji_osd_symbols.h index 747b3ba902..7c63eedb64 100644 --- a/src/main/io/dji_osd_symbols.h +++ b/src/main/io/dji_osd_symbols.h @@ -32,6 +32,7 @@ #define DJI_SYM_ROLL 0x14 #define DJI_SYM_PITCH 0x15 #define DJI_SYM_TEMPERATURE 0x7A +#define DJI_SYM_MAX 0x24 // GPS and navigation #define DJI_SYM_LAT 0x89 @@ -97,6 +98,8 @@ #define DJI_SYM_ARROW_SMALL_UP 0x75 #define DJI_SYM_ARROW_SMALL_DOWN 0x76 +#define DJI_SYM_ARROW_SMALL_RIGHT 0x77 +#define DJI_SYM_ARROW_SMALL_LEFT 0x78 // AH Bars #define DJI_SYM_AH_BAR9_0 0x80