Skip to content

Revert to actual BF font, now that DJI fixed G2 and newer #10620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmosca merged 8 commits into from
Jan 20, 2025
Merged

Revert to actual BF font, now that DJI fixed G2 and newer #10620

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af87947
Revert to actual DJI font, now that DJI fixed G2 and newer
mmosca Jan 19, 2025
3dedae1
symbols now match bf font again.
mmosca Jan 19, 2025
2820e39
Update logo message
mmosca Jan 19, 2025
ae6da62
Add LQ and symbols that are used in more than one place.
mmosca Jan 19, 2025
3497987
Fix typo
mmosca Jan 19, 2025
1d708c1
remove more ambiguity.
mmosca Jan 19, 2025
507097a
tabs vs spaces
mmosca Jan 20, 2025
b511de7
re-add thr0
mmosca Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/main/io/displayport_msp_dji_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand All @@ -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;

Expand All @@ -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;

Expand Down
3 changes: 3 additions & 0 deletions src/main/io/dji_osd_symbols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading