Merge pull request #3176 from jflyper/bfdev-reset-unsupported-mixer-to-custom-followup

Avoid custom mixers from resetting into MIXER_CUSTOM
This commit is contained in:
Michael Keller 2017-05-29 19:13:15 +12:00 committed by GitHub
commit 7a821b7bc4
1 changed files with 2 additions and 1 deletions

View File

@ -547,7 +547,8 @@ void activateConfig(void)
void validateAndFixConfig(void)
{
#if !defined(USE_UNCOMMON_MIXERS) && !defined(USE_QUAD_MIXER_ONLY) && !defined(USE_OSD_SLAVE)
if (mixers[mixerConfigMutable()->mixerMode].motor == NULL) {
mixerMode_e mixerMode = mixerConfigMutable()->mixerMode;
if (mixerMode != MIXER_CUSTOM && mixerMode != MIXER_CUSTOM_AIRPLANE && mixerMode != MIXER_CUSTOM_TRI && mixers[mixerMode].motor == NULL) {
mixerConfigMutable()->mixerMode = MIXER_CUSTOM;
}
#endif