Skip to content
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

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+53 −41
Open

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

Show file tree
Hide file tree
Changes from 2 commits
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;
MrD-RC marked this conversation as resolved.
Show resolved Hide resolved

/*

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
19 changes: 12 additions & 7 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 @@ -38,21 +38,25 @@
#define DJI_SYM_LAT 0x89
#define DJI_SYM_LON 0x98
#define DJI_SYM_ALTITUDE 0x7F
#define DJI_SYM_TOTAL_DISTANCE 0x71
#define DJI_SYM_OVER_HOME 0x05

// RSSI
#define DJI_SYM_RSSI 0x01
#define DJI_SYM_LINK_QUALITY 0x7B

// Throttle Position (%)
#define DJI_SYM_THR 0x04

// Unit Icons (Metric)
#define DJI_SYM_M 0x0C
#define DJI_SYM_KM 0x7D
#define DJI_SYM_C 0x0E

// Unit Icons (Imperial)
#define DJI_SYM_F 0x0D
#define DJI_SYM_FT 0x0F
#define DJI_SYM_MILES 0x7E
#define DJI_SYM_F 0x0D

// Heading Graphics
#define DJI_SYM_HEADING_N 0x18
Expand All @@ -63,13 +67,12 @@
#define DJI_SYM_HEADING_LINE 0x1D

// AH Center screen Graphics
#define DJI_SYM_CROSSHAIR_LEFT 0x72
#define DJI_SYM_CROSSHAIR_CENTRE 0x73
#define DJI_SYM_CROSSHAIR_RIGHT 0x74
#define DJI_SYM_AH_CENTER_LINE 0x72
#define DJI_SYM_AH_CENTER 0x73
#define DJI_SYM_AH_CENTER_LINE_RIGHT 0x74
#define DJI_SYM_AH_RIGHT 0x02
#define DJI_SYM_AH_LEFT 0x03
#define DJI_SYM_AH_DECORATION 0x13
#define DJI_SYM_SMALL_CROSSHAIR 0x7E

// Satellite Graphics
#define DJI_SYM_SAT_L 0x1E
Expand Down Expand Up @@ -136,17 +139,19 @@
#define DJI_SYM_WATT 0x57 // 0x57 is 'W'

// Time
#define DJI_SYM_ON_H 0x70
#define DJI_SYM_FLY_H 0x71
#define DJI_SYM_ON_M 0x9B
#define DJI_SYM_FLY_M 0x9C

// Speed
#define DJI_SYM_SPEED 0x70
MrD-RC marked this conversation as resolved.
Show resolved Hide resolved
#define DJI_SYM_KPH 0x9E
#define DJI_SYM_MPH 0x9D
#define DJI_SYM_MPS 0x9F
#define DJI_SYM_FTPS 0x99

// Menu cursor
#define DJI_SYM_CURSOR DJI_SYM_AH_LEFT

// Stick overlays
#define DJI_SYM_STICK_OVERLAY_SPRITE_HIGH 0x08
#define DJI_SYM_STICK_OVERLAY_SPRITE_MID 0x09
Expand Down
Loading