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
Mavlink: Update to HEAD from master branch and add upstream updates f… #14920
Merged
peterbarker
merged 4 commits into
ArduPilot:master
from
amilcarlucas:pr_test_mavlink_upstream_20200129
Jul 29, 2020
Merged
Mavlink: Update to HEAD from master branch and add upstream updates f… #14920
peterbarker
merged 4 commits into
ArduPilot:master
from
amilcarlucas:pr_test_mavlink_upstream_20200129
Jul 29, 2020
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
amilcarlucas
force-pushed
the
pr_test_mavlink_upstream_20200129
branch
from
July 27, 2020 14:50
5254f15
to
9f834f6
Compare
@tridge All checks passed, this can be merged after ArduPilot/mavlink#127 |
tridge
force-pushed
the
pr_test_mavlink_upstream_20200129
branch
from
July 28, 2020 21:15
6cc9872
to
5e1d745
Compare
I've merged the mavlink changes, but I'd like @peterbarker to have a look at the GENERATOR_STATUS change to make sure it doesn't impact on his use case |
On Tue, 28 Jul 2020, Andrew Tridgell wrote:
I've merged the mavlink changes, but I'd like @peterbarker to have a look at the GENERATOR_STATUS change to make sure it doesn't impact on his use case
There's an outstanding PR to use the newly-shaped message. Should be
merged in the next day or so.
|
@peterbarker can this go in now then? I would like to rebase and prepare the other mavlink PR |
I'll resolve the generator conflicts in the PR. Thanks, merged! |
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.
…rom 20200129
This is to test if the upstream mavlink changes break the code