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

WP mode altitude enforce hold fix #10002

Merged

Conversation

breadoven
Copy link
Collaborator

@breadoven breadoven commented May 3, 2024

Fixes an issue when WP turn smoothing is set to ON_CUT and altitude enforce is active. Causes mission to skip next WP when craft reaches WP altitude target.

Adds additional Nav State flag NAV_CTL_HOLD for Nav states that are hold points. Flag is used mainly to ensure fixed wing craft remain in a circular loiter flight path at hold WPs. Currently a fixed wing can drop out of the loiter flight path if it drifts too far away from the hold WP because the trigger to maintain a loiter is just based on distance from the hold WP not whether the WP is specifically a hold point. Dropping out of the loiter flight path has unpredictable results because it's used to control other behaviour such as WP turn smoothing.

@breadoven breadoven added this to the 7.1.1 milestone May 3, 2024
@DzikuVx
Copy link
Member

DzikuVx commented May 4, 2024

@breadoven when do you think we can have go/no-go on this PR? I'd like to build 7.1.1 as soon as this issue us resolved. Just a rough estimation would be fine. This or next weeks?

@breadoven
Copy link
Collaborator Author

@breadoven when do you think we can have go/no-go on this PR? I'd like to build 7.1.1 as soon as this issue us resolved. Just a rough estimation would be fine. This or next weeks?

I made some other changes that I've HITL tested which work as expected and should avoid further loiter hold problems on fixed wing. Shouldn't affect multirotor, but a quick test would be useful. I'll commit the changes now so you can see what you think.

@breadoven
Copy link
Collaborator Author

I've removed the don't merge but ideally it could do with a quick multirotor test just to check WP mission nav_mc_wp_slowdown which is the only thing that might be affected.

@breadoven
Copy link
Collaborator Author

Tested on multirotor and it behaved as expected during a WP mission so this should be OK to merge.

@DzikuVx DzikuVx merged commit dd91a87 into iNavFlight:release_7.1.1 May 6, 2024
14 checks passed
@DzikuVx
Copy link
Member

DzikuVx commented May 6, 2024

Thanks!

@breadoven breadoven deleted the abo_wp_alt_enforce_hold_fix branch May 6, 2024 21:41
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.

2 participants