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

Merge remote-tracking branch 'betaflight/betaflight' into development

Browse source 
# Conflicts:
#	src/main/config/config.c
#	src/main/io/serial_cli.c
This commit is contained in:
blckmn 2016-06-23 20:12:05 +10:00
commit cd9a97006f
10 changed files with 79 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -855,7 +855,7 @@ void mixTable(void)
}
// Motor stop handling
if (feature(FEATURE_MOTOR_STOP) && ARMING_FLAG(ARMED) && !feature(FEATURE_3D) && !IS_RC_MODE_ACTIVE(BOXAIRMODE)) {
if (feature(FEATURE_MOTOR_STOP) && ARMING_FLAG(ARMED) && !feature(FEATURE_3D) && !isAirmodeActive()) {
if (((rcData[THROTTLE]) < rxConfig->mincheck)) {
motor[i] = escAndServoConfig->mincommand;
}