Skip to content

OSD Nav Messages Update #6215

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.

Sign up for GitHub

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

Jump to bottom
Merged
digitalentity merged 24 commits into from
Nov 20, 2020
Merged

OSD Nav Messages Update #6215

digitalentity merged 24 commits into from
Nov 20, 2020

Conversation

@breadoven
Copy link
Collaborator

@breadoven breadoven commented Oct 13, 2020

System messages updated:

RTH climb phase added.
To WP message, WP number countdown added plus total number of WPs (To WP x / total WPs).
WP Hold, countdown timer added.

Don't know why settings.yaml is listed, it wasn't changed.

@breadoven
Merge pull request #1 from iNavFlight/master
5b2c02b 
Update My Fork
@breadoven
Update navigation.c
e09724b 
RTH Alt Override
@breadoven
Update navigation.c
3b34fb4
@breadoven
Merge branch 'master' of https://github.com/breadoven/inav
55454ae
@breadoven
Update navigation.c
6db2549
@breadoven
Update navigation.c
d24cbb1
@breadoven
RTH Override
18f5bec
@breadoven
Merge pull request #2 from iNavFlight/master
6e2eac3 
Update my fork
@breadoven
Revert "RTH Override"
1368d2e 
This reverts commit 18f5bec.
@breadoven
Revert "Update navigation.c"
61d1e41 
This reverts commit d24cbb1.
@breadoven
Revert "Revert "Update navigation.c""
fba427f 
This reverts commit 61d1e41.
@breadoven
Revert "Revert "RTH Override""
203d0b9 
This reverts commit 1368d2e.
@breadoven
Update navigation_private.h
0d4cb2e
@breadoven
Update navigation.h
d3629ff
@breadoven
Update navigation.c
ca05206
@breadoven
Update settings.yaml
0080d60
@breadoven
Merge pull request #4 from iNavFlight/master
42794ee 
Update Breadmaster
@breadoven
OSD Nav Message Update
0b38af6 
System Messages for:
RTH Climb Phase
To WP number countdown
WP Hold countdown timer
@stronnag
Copy link
Collaborator

stronnag commented Oct 14, 2020

settings.yaml is listed because unwanted white space was appended to line 2114. Please revert.

@breadoven
Copy link
Collaborator Author

breadoven commented Oct 14, 2020

Ah sorry about that Stronnag, still trying to understand the workings of Github. Think that whitespace got left over from something else when I was trying to clean up my master.

@breadoven
Update settings.yaml
924f05e 
Remove whitespace
@DzikuVx
Copy link
Member

DzikuVx commented Oct 14, 2020

@digitalentity could you please take a look?

digitalentity
digitalentity approved these changes Oct 15, 2020
View reviewed changes
Copy link
Member

@digitalentity digitalentity left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@digitalentity
Copy link
Member

digitalentity commented Nov 18, 2020

If nobody has objections, I'd like to merge this to 2.6

@digitalentity digitalentity added this to the 2.6 milestone Nov 18, 2020
@digitalentity digitalentity merged commit a8cda0c into iNavFlight:master Nov 20, 2020
@breadoven breadoven deleted the OSD-Nav-Message-Update branch November 21, 2020 23:17
@breadoven breadoven mentioned this pull request Nov 29, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@digitalentity digitalentity digitalentity approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

2.6

Development

Successfully merging this pull request may close these issues.

4 participants

@breadoven @stronnag @DzikuVx @digitalentity