Skip to content

Plane: fixed guided VTOL command in terrain mode #28406

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 3 commits into from
Mar 17, 2025

Conversation

tridge
Copy link
Contributor

@tridge tridge commented Oct 15, 2024

if the GCS commands a guided re-position with an AGL frame and quadplane is in Q_GUIDED_MODE=1 then this prevents us adding the home altitude to the target terrain altitude
we really need auto tests for these

@timtuxworth
Copy link
Contributor

What we really need to do is change to using an alt_frame attribute on Location instead of using these booleans.

@peterbarker
Copy link
Contributor

What we really need to do is change to using an alt_frame attribute on Location instead of using these booleans.

Yes, we do, I've had patches around it before.

There some subtleties around the terrain stuff in particularly - there's some weird persistence with terrain following which you have to be really careful around.

Nothing impossible, of course, but terrain is unforgiving :-)

The trick is to make .alt private in Location and fix what breaks.

@Ryanf55
Copy link
Contributor

Ryanf55 commented Oct 19, 2024

What we really need to do is change to using an alt_frame attribute on Location instead of using these booleans.

Yes, we do, I've had patches around it before.

There some subtleties around the terrain stuff in particularly - there's some weird persistence with terrain following which you have to be really careful around.

Nothing impossible, of course, but terrain is unforgiving :-)

The trick is to make .alt private in Location and fix what breaks.

@timtuxworth Wanna figure this out at dev conference this week?

@timtuxworth
Copy link
Contributor

Absolutely

Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs autotests

we need to fly somewhere with a different terrain height than home or
we cannot test terrain target
@tridge tridge force-pushed the pr-q-guided-terrain-fix branch from d42553a to fb18d31 Compare March 13, 2025 03:46
@tridge
Copy link
Contributor Author

tridge commented Mar 13, 2025

Needs autotests

test added

tridge added 2 commits March 13, 2025 15:18
if the GCS commands a guided re-position with an AGL frame and
quadplane is in Q_GUIDED_MODE=1 then this prevents us adding the home
altitude to the target terrain altitude
Copy link
Member

@IamPete1 IamPete1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tridge tridge merged commit cadb4d3 into ArduPilot:master Mar 17, 2025
72 checks passed
@rmackay9
Copy link
Contributor

I was unable to immediately include this in 4.6.0-beta5 due to merge conflicts

@rmackay9
Copy link
Contributor

rmackay9 commented Apr 1, 2025

this is included in 4.6.0-beta5 via PR rmackay9#40

@rmackay9 rmackay9 moved this from merge conflict to 4.6.0-beta5 in 4.6 Backports Apr 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Pending
Status: 4.6.0-beta5
Development

Successfully merging this pull request may close these issues.

7 participants