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

Mavlink: Update to HEAD from master branch and add upstream updates f… #14920

Merged

Conversation

amilcarlucas
Copy link
Contributor

…rom 20200129

This is to test if the upstream mavlink changes break the code

@amilcarlucas
Copy link
Contributor Author

amilcarlucas commented Jul 28, 2020

@tridge All checks passed, this can be merged after ArduPilot/mavlink#127

@tridge tridge force-pushed the pr_test_mavlink_upstream_20200129 branch from 6cc9872 to 5e1d745 Compare July 28, 2020 21:15
@tridge tridge requested a review from peterbarker July 28, 2020 21:15
@tridge
Copy link
Contributor

tridge commented Jul 28, 2020

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

@peterbarker
Copy link
Contributor

peterbarker commented Jul 28, 2020 via email

@amilcarlucas
Copy link
Contributor Author

@peterbarker can this go in now then? I would like to rebase and prepare the other mavlink PR

@peterbarker peterbarker merged commit 664b181 into ArduPilot:master Jul 29, 2020
@peterbarker
Copy link
Contributor

I'll resolve the generator conflicts in the PR.

Thanks, merged!

@amilcarlucas amilcarlucas deleted the pr_test_mavlink_upstream_20200129 branch July 29, 2020 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants