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

Make AP_Mission consider non _INT frame equivalent to their non-int counterpart #12962

Merged
merged 2 commits into from Dec 5, 2019

Conversation

peterbarker
Copy link
Contributor

No description provided.

AP_Mission: consider TERRAIN_ALT_INT equivalent to TERRAIN_ALT

AP_Mission: consider RELATIVE_ALT_INT equivalent to RELATIVE_ALT

AP_Mission: consider GLOBAL_INT equivalent to GLOBAL
@rmackay9
Copy link
Contributor

rmackay9 commented Dec 4, 2019

I've tested this with QGC but it doesn't seem to resolve the problem. My testing procedure is:

  1. start QGC and connect to the vehicle
  2. upload a mission with one mission command using Terrain alt
  3. download the mission and check the altitude frame still shows Terrain
  4. connect with MP and download the mission and confirm the altitude frame still shows Terrain

So at the moment both steps 3 and 4 are failing. The mission command's altitude frame is being changed to Absolute. What's different vs master is that it seems the altitude itself is being modified along with the frame.

@WickedShell
Copy link
Contributor

@rmackay9 do you have a tlog of the upload from QGC for reference?

@rmackay9
Copy link
Contributor

rmackay9 commented Dec 4, 2019

@WickedShell, I'm not quite sure where QGC tlogs appear .. I've looked but can't find them :-(

EDIT: OK, I've found them and here is a link to a very simple upload/download of the mission.

@peterbarker
Copy link
Contributor Author

As discussed with @rmackay9 elsewhere, this wasn't intended as a fix for the QGC terrain-alt issue (#12917). I have put an extensive comment on that issue explaining that QGC seems to be uploading with the incorrect frame.

This was to address another point made in yesterday's devcall, which was that we should consider the _INT frames equivalent to the non-_INT equivalents. We accept either but only ever send the non-INT frames is the idea.

Without this patch we do NOT accept several of the _INT frames when uploading missions - the included tests showed that.

@rmackay9
Copy link
Contributor

rmackay9 commented Dec 4, 2019

ok, thanks. I think we can merge this then.. I guess the semaphore failures are nothing to worry about?

@peterbarker
Copy link
Contributor Author

@rmackay9 oh, the semaphore failures are something to worry about, but they're definitely not due to this PR - every PR is failing semaphore ATM because we're overflowing MatekF405-Wing's flash.

So yes, I think this is good to go.

@rmackay9 rmackay9 merged commit b0ea662 into ArduPilot:master Dec 5, 2019
@peterbarker peterbarker deleted the pr/frame-tests branch December 5, 2019 02:05
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

4 participants