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

only apply osd defines if not set #13612

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

freasy
Copy link
Member

@freasy freasy commented Apr 30, 2024

This enables the user to make a local build and select osd_displayport_device and vcd_system_type via OSD_SD and OSD_HD defines in cli. Prior to this, you can not select which are preselected via EXTRA_FLAGS as it would be a redefine.

Copy link

Do you want to test this code? You can flash it directly from Betaflight Configurator:

  • Simply put #13612 (this pull request number) in the Select commit field of the Configurator firmware flasher tab (you need to Enable expert mode, Show release candidates and Development).

WARNING: It may be unstable. Use only for testing!

@nerdCopter
Copy link
Member

should they be separated rather than &&? i don't know for sure, just asking.

@freasy
Copy link
Member Author

freasy commented May 3, 2024

should they be separated rather than &&? i don't know for sure, just asking.

No you only want defines if neither is set before

Copy link

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

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

In other words, if neither set, make both available, otherwise honour just the one set. Nice!

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

Successfully merging this pull request may close these issues.

None yet

4 participants