Add pilot logo to OSD #9332
Merged
Add pilot logo to OSD #9332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Separated HD and SD arming screen - Added symbol for pilot logo - Switched space indents to tabs in osd_symbols.h
- Switch small pilot logo to 3 characters - Added base code for arm screen
- Added use pilot logo option to CLI - Converted osd.h to use tabs
- Added small pilot logo initial code - Fixed error from tabs in osd.h
- Added arm screen timeout as CLI settable option. Defaults to current 1.5 seconds. - Fixed boot screen stats. Bug would have existed since 3.0 - Initial code for swapping logos on the boot screen - Replaced pseudo code with actual logic for using pilot logo on HD arming screen - Used already existing logic for detecting if display is HD
Unfortunately the large pilot logo can't be available on SD. There seems to be an issue with the storage on the MAX7456 chip. The last 33 characters of page 2 seem to corrupt on power loss. After uploading the font, all looks fine. After a reboot, the logo looks fine. But after a power cycle, the last 33 characters are corrupted. Changes: - cms.h now back to tabs - moved logo and stats drawing to own functions, to save repetition. - Made large pilot logo HD only - Disabled large pilot logo support with BFCOMPAT mode. - Stats and logos will self centre, no matter the column width. - All arm screen times will be increased by 3 seconds with a safehome failure message.
- Added the ability to specify the gap between the logos - Matched arm screen and boot screen logo displays
Changes to HD arming screen - Explicitly select safehome row - temporarily removed stats due to space - combined craft name and armed to a single row. - put lon and lat on single row. - changed time format (need to test), as tenths of seconds is a bit pointless. date would be more useful.
- Removed unneeded code after testing new date time format on HD arm screen. I needed to use actual aircraft as HITL doesn't support date/time over GPS. - Updated date time format on SD arm screen - Remove extra row if safehomes is not used - Switched around format of safehome display for readability - Arm screens will show stats if there is enough space to neatly do so - Single row for long lat on SD, as there is plenty of space - Tidied up all the `y + x` instances on SD arm screen, and made the variable name more explicit
Damn, I hate spaces. Tabs for alignment makes so much more sense :(
|
I ca. Have a look later today. []s,Marcelo Bezerra ***@***.***>On 1 Oct 2023, at 11:28, Darren Lines ***@***.***> wrote:
@mmosca @stronnag I'm getting issues with the Mac SITL checks.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
|
|
fixes the issue in my (albeit old) MacOS VM |
|
Thanks @stronnag |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change adds the ability to have a pilot logo on the boot and arm screen and a smaller version that can be displayed anywhere on the OSD. This change also adds a different arming screen for HD systems, to include the logo.
The large pilot logo is HD only. The small logo also works on analogue. The large pilot logo would work on analogue. Only the MAX7456 chip seems to corrupt the last 33 characters seem to get corrupted on power loss. If anyone has any ideas on how this could be fixed. I'm open to suggestions.
While making this change I also cleaned up the arming screen a little. If there is space, stats are also shown on the arming screen now, if enabled.
Requires Configurator: iNavFlight/inav-configurator#1835
New settings:
osd_arm_screen_display_time The amount of time the arming screen is displayed.
osd_inav_to_pilot_logo_spacing The spacing between two logos. This can be used to have no space, so the original INAV logo and Pilot Logo can be combined in to a larger logo.
osd_use_pilot_logo Enable to use the large pilot logo.
Examples
Combined pilot logo on HD arming screen
HD Arming screen with pilot logo enabled
Example of issue with analogue font
Logo shown after installing the font, but before power loss (removing USB or battery)
Logo shown after power loss
