Merge pull request #5290 from AndersHoglund/fix_failsafe_vtx_power

VTX low power on disarm correction
This commit is contained in:
Michael Keller 2018-02-24 18:53:14 +13:00 committed by GitHub
commit 9e28cbd341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -31,6 +31,8 @@
#include "fc/rc_modes.h"
#include "fc/runtime_config.h"
#include "flight/failsafe.h"
#include "io/vtx.h"
#include "io/vtx_string.h"
#include "io/vtx_control.h"
@ -106,7 +108,7 @@ static vtxSettingsConfig_t vtxGetSettings(void)
}
#endif
if (!ARMING_FLAG(ARMED) && settings.lowPowerDisarm) {
if (!ARMING_FLAG(ARMED) && settings.lowPowerDisarm && !failsafeIsActive()) {
settings.power = VTX_SETTINGS_DEFAULT_POWER;
}