Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 17:55:28 +03:00
Code Issues Wiki Activity

Merge branch 'master' into abo_rth_trackback

Browse source
This commit is contained in:
breadoven 2022-05-30 10:32:50 +01:00 • committed by GitHub
commit 15db2446b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
117 changed files with 1478 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/navigation/navigation.c
View file

@ -3376,13 +3376,9 @@ static void processNavigationRCAdjustments(void)
}
if (navStateFlags & NAV_RC_POS) {
if (!FLIGHT_MODE(FAILSAFE_MODE)) {
posControl.flags.isAdjustingPosition = adjustPositionFromRCInput();
}
else {
if (!STATE(FIXED_WING_LEGACY)) {
resetMulticopterBrakingMode();
}
posControl.flags.isAdjustingPosition = adjustPositionFromRCInput() && !FLIGHT_MODE(FAILSAFE_MODE);
if (STATE(MULTIROTOR) && FLIGHT_MODE(FAILSAFE_MODE)) {
resetMulticopterBrakingMode();
}
}
else {