1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 00:05:28 +03:00

Merge pull request #3297 from shellixyz/fix_and_simplify_applyFixedWingPitchRollThrottleController

Fix and simplify applyFixedWingPitchRollThrottleController()
This commit is contained in:
Alberto García Hierro 2018-06-11 12:57:52 +01:00 committed by GitHub
commit 99cbb3f8f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 45 deletions

View file

@ -2762,7 +2762,7 @@ rthState_e getStateOfForcedRTH(void)
bool navigationIsControllingThrottle(void)
{
navigationFSMStateFlags_t stateFlags = navGetCurrentStateFlags();
return (stateFlags & (NAV_CTL_ALT | NAV_CTL_EMERG | NAV_CTL_LAUNCH | NAV_CTL_LAND)) || (STATE(FIXED_WING) && (stateFlags & (NAV_CTL_POS)));
return (stateFlags & (NAV_CTL_ALT | NAV_CTL_EMERG | NAV_CTL_LAUNCH | NAV_CTL_LAND));
}
bool navigationIsFlyingAutonomousMode(void)