Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-08 17:08:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: don't prevent stick mixing in none RC failsafe

Browse Source
This commit is contained in:
Iampete1 2022-03-06 17:03:40 +00:00 committed by Andrew Tridgell
parent 4d40ef5d0a
commit 54e57ccff0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ArduPlane/Attitude.cpp
View File

@ -82,9 +82,8 @@ bool Plane::stick_mixing_enabled(void)
if (g.stick_mixing != StickMixing::NONE &&
g.stick_mixing != StickMixing::VTOL_YAW &&
stickmixing &&
failsafe.state == FAILSAFE_NONE &&
!rc_failsafe_active()) {
// we're in an auto mode, and haven't triggered failsafe
// we're in an auto mode, and haven't triggered rc failsafe
return true;
} else {
return false;