-
Notifications
You must be signed in to change notification settings - Fork 13.7k
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
Support rally landing points #12696
Support rally landing points #12696
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for bringing this back.
I think we should just merge this and then work out more elaborate behaviors.
@hamishwillee fyi
874b254
to
baaee04
Compare
Jenkins is unhappy:
|
Assuming this goes in, is there any further work to be done to make it work with QGC - ie will upload magically work for PX4 in the same way as for ArduPilot? [Note, I think the upload probably already works, it's just that the points aren't used] And just to confirm, the handling is currently always to RTL to closest "safe point" (rally point or home)? |
baaee04
to
d3af8be
Compare
@bkueng I added a new commit to allow for mission landings if the RTL chooses home to land at. Would be cool if you could review that as well. |
I'm wondering if the the closest safe landing point should be updated in |
2a69185
to
45e6d6a
Compare
What does this mean? A planned mission landing is by definition wherever the mission says it should be, not home. Also, this appears to be for MC. What happens for FW and VTOL for these settings? |
ec8264d
to
c951378
Compare
The review comment commits should not be in upstream later - make sure to squash all commits on merging or do an interactive rebase. Commits should represent blocks of functionality, not the history of what you did. |
Signed-off-by: Silvan Fuhrer <[email protected]>
…ome if that's closer Signed-off-by: Silvan Fuhrer <[email protected]>
…n landing and safe points Signed-off-by: Silvan Fuhrer <[email protected]> Co-authored by Martina Rivizzigno <[email protected]>
89ba3a2
to
6f110c0
Compare
Flight tested the PR. Behaved as expected. Here's a log https://review.px4.io/plot_app?log=ccd0d34d-f426-444d-ac9f-55526c1be1a9 |
6f110c0
to
e3ec4dd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good to merge once CI passes.
e3ec4dd
to
0c2c64b
Compare
@mrivi Can you answer the questions #12696 (comment) and #12696 (comment) - specifically, which parameters are still relative to home and which are relevant to the rally point. Or to put it another way, how do you know it worked as expected when there is no definition of the expectation? |
Also, do these apply to all vehicles, or just MC? |
Yes, also applies to VTOL and FW. With RTL_TYPE=3 (aka the new "find closest" landing point in RTL), it will chose whether home, land (resp. the DO_LAND_START waypoint if set) or a safe landing point is closest. If it's the DO_LAND_START one it will do the mission landing starting at this point, otherwise a "normal" RTL-landing (with that I mean transitioning to MC above landing point for VTOL and descend vertically, and loiter for a FW). Let me know if that makes it clear or if you need some further help (I guess you want to update the user guide?) |
The return altitude is relative to whatever altitude homer or the safe lading point is set to (resp. to the altitude of the wp at the DO_LAND_START marker). |
So the cone RTL is not yet described anywhere? From what I understand by looking at the implementation is that the user can set the RTL cone angle. The vehicle will then return on the altitude set by the cone, which is a function of horizontal distance to landing point (the alt will though at least be RTL_DESCEND_ALT). @bresch @MaEtUgR please correct me if I'm wrong. |
Thanks @sfuhrer . Yes, that is exactly the clarification I needed - all altitudes are relative to the destination, not home. Docs for the cone are here: http://docs.px4.io/master/en/flight_modes/return.html#return_altitude Note, I find it a little odd that RTL_TYPE=0 doesn't use rally points as well. |
I updated RTL param docs in #13302. Please review. |
This PR is a rebased and slightly modified version of #7743 of @bkueng to enable landings at Rally Points during an RTL.
Describe problem solved by the proposed pull request
When a RTL is triggered, the vehicle will land at the closest Rally point or home it that's closer. If a mission landing is planned (applies mainly for VTOL or FW), then the DO_LAND_START marker replaces Home, meaning that it will check if that one is closer than any rally point, fly to it and then continue the landing procedure.
Test data / coverage
SITL tested.
Additional context
This is a first, basic, implementation of Rally points. There is especially some discussion and follow up work needed on when it should land at the closest Rally point, or really come all the way back to home. E.g. if the RTL was triggered by the user or due to RC loss, the expected behavior is that it comes to home. Battery empty RTL's make sense at the closes Rally point.
Also, if flying a VTOL and a malfunction of the FW system is detected (either automatically or by the user) and it thus is in hover mode, landing at the closes Rally point is crucial as probably the distance to home is too large.
EDIT:
I've made some changes: