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.

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

Conversation

mmosca
Copy link
Collaborator

@mmosca mmosca commented Jan 19, 2025

No description provided.

@mmosca mmosca requested a review from MrD-RC January 19, 2025 11:14
@mmosca mmosca marked this pull request as ready for review January 19, 2025 11:21
@mmosca mmosca added this to the 8.0 milestone Jan 19, 2025
@mmosca mmosca changed the title Revert to actual DJI font, now that DJI fixed G2 and newer Revert to actual BF font, now that DJI fixed G2 and newer Jan 19, 2025
@MrD-RC MrD-RC added the Release Notes Add this when a PR needs to be mentioned in the release notes label Jan 19, 2025
@MrD-RC
Copy link
Collaborator

MrD-RC commented Jan 19, 2025

It would be worth adding to the release notes that Goggles V2 will have some issues. Also that Goggles 2 and above will need to be on the latest firmware.

@dzaro-dev
Copy link
Contributor

dzaro-dev commented Jan 19, 2025

Hi @mmosca ,

I think you may have forgotten a few icons that can be used:

LQ symbol:

image

        case SYM_RSSI:
            return DJI_SYM_RSSI;

        case SYM_LQ:
            return DJI_SYM_LQ;
// RSSI
#define DJI_SYM_RSSI                    0x01 // RSSI bars
#define DJI_SYM_LQ                      0x7B // RSSI bars with LQ on top

Compass symbol:

The betaflight speed icon also looks alittle bit like half of a compass:
image

        case SYM_DEGREES:
            return DJI_SYM_HEADING_DEGREE;

        case SYM_HEADING:
            return DJI_SYM_HEADING;
#define DJI_SYM_HEADING                 0x70 // Betaflight speed symbol (looks like compass symbol)
#define DJI_SYM_HEADING_DEGREE          0x08 // High circle looks like degrees icon

There might be a few others as well.

@MrD-RC
Copy link
Collaborator

MrD-RC commented Jan 19, 2025

I agree with LQ. But using speed as compass is too wrong.

@dzaro-dev
Copy link
Contributor

INAV doesn't have a speed symbol anyway, might as well use it for something.

Here's the code snippet:

    case OSD_UNIT_METRIC:
        if (_max) {
            tfp_sprintf(buff, "%c%3d%c", SYM_MAX, (int)osdConvertVelocityToUnit(vel), (_3D ? SYM_3D_KMH : SYM_KMH));
        } else {
            tfp_sprintf(buff, "%3d%c", (int)osdConvertVelocityToUnit(vel), (_3D ? SYM_3D_KMH : SYM_KMH));
        }
        break;

@MrD-RC
Copy link
Collaborator

MrD-RC commented Jan 19, 2025

That is a gauge. It would be fine for speed or RPM. But makes no sense for compass. Just using it for the sake of it is not the correct approach.

Also, we should not be changing osd.c. These should be symbol changes only.

@sensei-hacker
Copy link
Collaborator

sensei-hacker commented Jan 19, 2025

I pretty much agree - LQ yes, and thanks for pointing that out!

Speed for heading? Nah. Though I wouldn't be too upset if that was done.

I can understand "may as well use it for something", but
"may as well use it for something" would also apply to marking your home location with a skull 💀.

src/main/io/displayport_msp_dji_compat.c Show resolved Hide resolved
@@ -142,12 +142,13 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page)

case SYM_MAH:
return DJI_SYM_MAH;

/*
Copy link
Collaborator

@MrD-RC MrD-RC Jan 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe symbols 0x7D and 0x7E are Km and Miles respectively. I know they're commented out. But is it worth using the correct symbol for completeness?

image

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What line are you referring to? The efficiency ones are not available in the DJI/BF font.

The distance 0x&d and 0x7E are used in SYM_KM, SYN_MI

src/main/io/dji_osd_symbols.h Show resolved Hide resolved
@mmosca
Copy link
Collaborator Author

mmosca commented Jan 19, 2025

case OSD_UNIT_METRIC:
    if (_max) {
        tfp_sprintf(buff, "%c%3d%c", SYM_MAX, (int)osdConvertVelocityToUnit(vel), (_3D ? SYM_3D_KMH : SYM_KMH));
    } else {
        tfp_sprintf(buff, "%3d%c", (int)osdConvertVelocityToUnit(vel), (_3D ? SYM_3D_KMH : SYM_KMH));
    }
    break;

Not going to more extra code for this kind of stuff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Release Notes Add this when a PR needs to be mentioned in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants