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

[MSP] Correctly report the configured and active OSD type #9333

Merged
merged 1 commit into from Jan 13, 2020

Conversation

fiam
Copy link
Contributor

@fiam fiam commented Jan 3, 2020

  • Tell the OSD driver the type of displayPort, so it can be retrieved
    later.
  • Use OSD driver code instead of device specific code to handle
    MSP_OSD_CONFIG response while minimizing driver specific code.
  • Add flag for signaling the use of FrSky OSD (bit 3).
  • Rename OSD_FLAGS_MAX7456_DETECTED to OSD_FLAGS_OSD_DEVICE_DETECTED.
    Since we only support one OSD device type at a time, we can use the
    same bit to signal wether the hardware has been detected.

fiam added a commit to fiam/betaflight-configurator that referenced this pull request Jan 3, 2020
Use the flags added in betaflight/betaflight#9333
to detect wether the font manager dialog should be shown. This FrSkyOSD
fixes the bug that was preventing the Font Manager dialog to be shown
when FrSky OSD was in use.
- Tell the OSD driver the type of displayPort, so it can be retrieved
later.
- Use OSD driver code instead of device specific code to handle
MSP_OSD_CONFIG response while minimizing driver specific code.
- Add flag for signaling the use of FrSky OSD (bit 3).
- Rename OSD_FLAGS_MAX7456_DETECTED to OSD_FLAGS_OSD_DEVICE_DETECTED.
Since we only support one OSD device type at a time, we can use the
same bit to signal wether the hardware has been detected.
@fiam
Copy link
Contributor Author

fiam commented Jan 13, 2020

Could someone take a look at this one? It's needed, coupled with betaflight/betaflight-configurator#1852, to support font uploads for devices that support MAX7456 fonts but are not a MAX7456 (like FrSky OSD).

@mikeller mikeller added this to the 4.2 milestone Jan 13, 2020
@mikeller mikeller merged commit f53d812 into betaflight:master Jan 13, 2020
@fiam
Copy link
Contributor Author

fiam commented Jan 14, 2020

Thanks @mikeller!

fiam added a commit to fiam/betaflight-configurator that referenced this pull request Jan 16, 2020
Use the flags added in betaflight/betaflight#9333
to detect wether the font manager dialog should be shown. This FrSkyOSD
fixes the bug that was preventing the Font Manager dialog to be shown
when FrSky OSD was in use.
@fiam fiam deleted the agh_osd_flags branch January 17, 2020 11:42
fiam added a commit to fiam/betaflight-configurator that referenced this pull request May 25, 2020
Use the flags added in betaflight/betaflight#9333
to detect wether the font manager dialog should be shown. This fixes the
that was preventing the Font Manager dialog to be shown when FrSky OSD
was in use.
@nerdCopter
Copy link
Member

nerdCopter commented Oct 26, 2022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants