Surface tracking: preserve full pilot climb/descent authority#32789
Open
lthall wants to merge 3 commits intoArduPilot:masterfrom
Open
Surface tracking: preserve full pilot climb/descent authority#32789lthall wants to merge 3 commits intoArduPilot:masterfrom
lthall wants to merge 3 commits intoArduPilot:masterfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Adjusts ArduCopter surface tracking integration so terrain-following no longer consumes the full vertical rate “budget” and blocks pilot climb/descent commands, preserving full net pilot authority while still respecting overall vertical limits.
Changes:
- Exposes terrain-following vertical velocity from
AC_PosControlfor use by pilot climb-rate mapping. - Adjusts pilot climb/descent rate scaling based on current terrain-following vertical velocity contribution.
- Removes per-mode post-clamp of pilot climb rate that would negate the adjusted authority.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| libraries/AC_AttitudeControl/AC_PosControl.h | Adds accessor for terrain vertical velocity contribution (_vel_terrain_d_ms). |
| ArduCopter/Attitude.cpp | Adjusts pilot climb-rate curve to account for terrain-following velocity; adds adjusted pilot speed helpers. |
| ArduCopter/Copter.h | Declares adjusted pilot climb/descent limit helper methods. |
| ArduCopter/mode_althold.cpp | Removes post-constrain of pilot climb rate. |
| ArduCopter/mode_loiter.cpp | Removes post-constrain of pilot climb rate. |
| ArduCopter/mode_poshold.cpp | Removes post-constrain of pilot climb rate. |
| ArduCopter/mode_sport.cpp | Removes post-constrain of pilot climb rate. |
| ArduCopter/mode_flowhold.cpp | Removes post-constrain of pilot climb rate. |
| ArduCopter/mode_zigzag.cpp | Removes post-constrain of pilot climb rate. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
54a8a84 to
cc587bf
Compare
Contributor
|
@lthall log from #32740 (comment): 00000016.BIN.zip |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Surface tracking can currently saturate vertical rate limits, preventing the pilot from commanding climb or descent when terrain-following is active.
This change adjusts the pilot’s effective climb/descent limits based on the terrain-following command, ensuring the pilot always retains full vertical authority while still allowing terrain tracking to operate within the overall limits.
Classification & Testing (check all that apply and add your own)