mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-22 15:55:48 +03:00
Merge branch 'master' into betaflight
Conflicts: src/main/drivers/system.c src/main/rx/rx.h
This commit is contained in:
commit
febee3fb90
26 changed files with 812 additions and 320 deletions
|
@ -346,6 +346,9 @@ void mwArm(void)
|
|||
if (ARMING_FLAG(ARMED)) {
|
||||
return;
|
||||
}
|
||||
if (IS_RC_MODE_ACTIVE(BOXFAILSAFE)) {
|
||||
return;
|
||||
}
|
||||
if (!ARMING_FLAG(PREVENT_ARMING)) {
|
||||
ENABLE_ARMING_FLAG(ARMED);
|
||||
headFreeModeHold = heading;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue