Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 05:15:25 +03:00
Code Issues Wiki Activity

Merge branch 'betaflight' into ready_to_merge

Browse source 
# Conflicts:
#	src/main/io/serial_msp.c
This commit is contained in:
blckmn 2016-06-20 18:16:22 +10:00
commit c889f00d26
3 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/flight/mixer.c
View file

@ -831,7 +831,7 @@ void mixTable(void)
rollPitchYawMix[i] = qMultiply(mixReduction,rollPitchYawMix[i]);
}
// Get the maximum correction by setting offset to center
throttleMin = throttleMax = throttleMin + (throttleRange / 2);
if (!escAndServoConfig->escDesyncProtection) throttleMin = throttleMax = throttleMin + (throttleRange / 2);
} else {
throttleMin = throttleMin + (rollPitchYawMixRange / 2);
throttleMax = throttleMax - (rollPitchYawMixRange / 2);