Fix and simplify applyFixedWingPitchRollThrottleController() #3297
Conversation
This file contains 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
Should only control pitch and throttle when nav stateFlags & NAV_CTL_ALT Needed for upcoming CRUISE 2D mode
| rollCorrection = constrain(rollCorrection, -DEGREES_TO_DECIDEGREES(navConfig()->fw.max_bank_angle), DEGREES_TO_DECIDEGREES(navConfig()->fw.max_bank_angle)); | ||
| rcCommand[ROLL] = pidAngleToRcCommand(rollCorrection, pidProfile()->max_angle_inclination[FD_ROLL]); | ||
| } | ||
| // Speed controller - only apply in POS mode when NOT NAV_CTL_LAND |
There was a problem hiding this comment.
Now this is applied only if both ALT and POS controllers are active, while previously speed guard only required POS which is reasonable. Why change?
There was a problem hiding this comment.
For the moment all nav states using POS also use ALT so it won't change anything for those but for cruise 2D we need manual throttle control (no ALT) and we can't have both manual throttle control and min speed applied.
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.
Should only control pitch and throttle when nav stateFlags & NAV_CTL_ALT
Needed for upcoming CRUISE 2D mode