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

Add option to display the OSD logo on arming #9244

Merged
merged 2 commits into from Nov 30, 2019

Conversation

etracer65
Copy link
Member

@etracer65 etracer65 commented Nov 28, 2019

By user request.

Adds osd_logo_on_arming setting with values OFF, ON, FIRST_ARMING (defaults to OFF). Optionally displays the OSD splash logo during the "ARMING" message.

The duration that the logo displays can be set with osd_logo_on_arming_duration which is configured in 0.1s intervals ranging from 5 to 50 (0.5s to 5.0s). The default is 5 (0.5s) to be consistent with the previous "ARMED" splash screen.

Allows custom logos to be recorded on DVR and useful for spectators at races. Might also increase uptake on the custom logo capability in the Configurator.

Adds `osd_logo_on_arming` setting with values `OFF, ON, FIRST_ARMING` (defaults to `OFF`). Optionally displays the OSD splash logo durin the "ARMING" message.
@etracer65 etracer65 added this to the 4.2 milestone Nov 28, 2019
mikeller
mikeller previously approved these changes Nov 28, 2019
@smitty97
Copy link

Awesome! With a pit switch i never see my logo. Thanks etracer65!

Adds `osd_logo_on_arming_duration` which is configured in 0.1s intervals ranging from 5 to 50 (0.5s to 5.0s). The default is 5 (0.5s) to be consistent with the previous "ARMED" splash screen.
@etracer65
Copy link
Member Author

Pushed a commit to add configurable display duration.

{
static bool everArmed = false;
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if this could be replaced by checking ARMING_FLAG(WAS_EVER_ARMED). It will need some refactoring, but I can have a look into it.

Copy link
Member Author

Choose a reason for hiding this comment

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

No, I originally tried that. But by the time we get to this code we are already armed and ARMING_FLAG(WAS_EVER_ARMED) is already true.

Copy link
Member

Choose a reason for hiding this comment

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

See #9248.

@mikeller mikeller merged commit 938f46c into betaflight:master Nov 30, 2019
@etracer65 etracer65 deleted the osd_logo_on_arming branch December 4, 2019 13:40
@asizon
Copy link
Member

asizon commented Dec 4, 2019

@etracer65 Can be allow 300x160 pixels for the logo? In such a way that it can be shown bigger and centered?

@etracer65
Copy link
Member Author

@asizon No, the resolution cannot be changed. Also the logo is positioned the same as at boot time and must make room for the "ARMED" message which is the actual point of the momentary display at arming. The logo is a "nice to have" but doesn't get priority.

@mikeller
Copy link
Member

mikeller commented Dec 5, 2019

@asizon: The 'logo' is actually made up of characters that are part of the character set that is uploaded to the MAX7456 OSD chip. So the only way to make the logo bigger is to increase the number of characters reserved for the logo. Since there are not many unused characters at the moment there is no easy way to achieve this with current hardware.

@asizon
Copy link
Member

asizon commented Dec 5, 2019

@etracer65 @mikeller Understood, thanks for the explanation, I was afraid that there will be no free characters for easy logo expand, then maybe later, in the near future

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

4 participants