Skip to content

Plane: fix rangefinder correction when terrain follow is off #23658

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

Merged
merged 1 commit into from
May 21, 2024

Conversation

jschall
Copy link
Contributor

@jschall jschall commented May 2, 2023

Previous behavior was either to flare extremely high or crash into the ground, depending on whether the land waypoint is higher or lower than home.

This allows the user to set a land waypoint altitude other than 0 relative without causing a crash.

@jschall jschall added the Plane label May 2, 2023
@jschall jschall requested a review from tridge May 8, 2023 21:02
@tridge
Copy link
Contributor

tridge commented May 9, 2023

sitl test log demonstrating the issue would be great, and autotest

@tridge
Copy link
Contributor

tridge commented May 15, 2023

@jschall log?

@jschall
Copy link
Contributor Author

jschall commented May 17, 2023

@tridge https://drive.google.com/file/d/1LFRRkQjggtAep9h6hM2olxxt2rRAj__V/view?usp=sharing

One log of master crashing into the ground without flaring despite seeing the ground with the rangefinder.
One log of this patch not doing so.

@jschall
Copy link
Contributor Author

jschall commented May 18, 2023

@tridge pushed my rebase - the commit hash in the logs should now match this PR.

@magicrub
Copy link
Contributor

@jschall @tridge where are we at on this?

@jschall
Copy link
Contributor Author

jschall commented May 21, 2024

@tridge poke

@tridge tridge mentioned this pull request May 21, 2024
52 tasks
@jschall
Copy link
Contributor Author

jschall commented May 21, 2024

https://drive.google.com/drive/folders/1cxfPqSMOMw9UEtxfGyfpIHEwlN3aHjs0?usp=drive_link

Corrected google drive link with both logs.

@tridge
Copy link
Contributor

tridge commented May 21, 2024

@jschall I've reproduced, and the key parameter from your log is LAND_FLARE_SEC=0, so the "flare time before impact" is set to zero.

@tridge
Copy link
Contributor

tridge commented May 21, 2024

@jschall thanks, I've been over this now in SITL and I'm convinced you are right

@tridge tridge merged commit 9e08a98 into ArduPilot:master May 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: 4.5.5-beta1
Development

Successfully merging this pull request may close these issues.

4 participants