Align OSD waypoint number display with geospatial waypoints #6429
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
|
Added WP distance counter to OSD "TO WP" message. |
avsaase
reviewed
Apr 4, 2021
breadoven
changed the title
breadoven
changed the title
|
Means of determining realigned geospatial WP numbering changed to iterative method removing the need for an array to store values. |
|
@breadoven Can you rebase on the |
Fix to ensure only geospatial WPs are displayed on OSD with sequential numbering maintained around nongeo WPs.
Change from using WP.flag to WP.p3
Change from using WP .P3 to dedicated geospatial WP list list array
Change to remove array for storing geospatial WP indices. Uses iterative method to determine geospatial WP numbering instead.
breadoven
force-pushed
the
abo_fix_OSD_WP_message
branch
from
2baeb7a to
012c7fb
Compare
|
@avsaase OK that seems to have worked. The final diff looks correct. |
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.
Waypoint missions that include nongeospatial waypoints, JUMP, HEADING, POI, display WP numbers in the OSD that follow the numeric sequence of all WPs in the mission rather than just the geospatial WPs which would seem a more intuitive expectation from a user point of view. This means the displayed WP numbers can appear inconsistent and increment by more than 1 when nongeo WPs are passed.
This PR fixes this by realigning the WP numbers displayed in the OSD with just the geospatial WPs and also adds a geospatial WP total count.
Tested in flight and works as expected for fixed wing and multirotor.