Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 06:45:16 +03:00
Code Issues Wiki Activity

Merge pull request #10559 from alexeystn/fix_boxparalyze_disarm

Browse source
This commit is contained in:
Michael Keller 2021-02-19 00:40:24 +13:00
parent e0c4560c1c
commit 61a66ca85e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/fc/core.c
View file

@ -935,7 +935,7 @@ bool processRx(timeUs_t currentTimeUs)
disarmAt = currentTimeUs + autoDisarmDelayUs; // extend auto-disarm timer disarmAt = currentTimeUs + autoDisarmDelayUs; // extend auto-disarm timer
} }
if (!IS_RC_MODE_ACTIVE(BOXPARALYZE) if (!(IS_RC_MODE_ACTIVE(BOXPARALYZE) && !ARMING_FLAG(ARMED))
#ifdef USE_CMS #ifdef USE_CMS
&& !cmsInMenu && !cmsInMenu
#endif #endif
@ -956,7 +956,7 @@ bool processRx(timeUs_t currentTimeUs)
} }
#endif #endif
if (!cliMode && !IS_RC_MODE_ACTIVE(BOXPARALYZE)) { if (!cliMode && !(IS_RC_MODE_ACTIVE(BOXPARALYZE) && !ARMING_FLAG(ARMED))) {
processRcAdjustments(currentControlRateProfile); processRcAdjustments(currentControlRateProfile);
} }