From ba99a372a17706ffaa7378bde5d7c4ee27ce3e0a Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 29 May 2017 12:13:33 +0900 Subject: [PATCH 1/2] Reset mixer to MIXER_CUSTOM if configured mixer is not supported --- src/main/fc/config.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 6eb12b8b5b..1caed29396 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -546,6 +546,12 @@ void activateConfig(void) void validateAndFixConfig(void) { +#if !defined(USE_UNCOMMON_MIXERS) || defined(USE_QUADX_MIXER_ONLY) + if (mixers[mixerConfigMutable()->mixerMode].motor == NULL) { + mixerConfigMutable()->mixerMode = MIXER_CUSTOM; + } +#endif + #ifndef USE_OSD_SLAVE if((motorConfig()->dev.motorPwmProtocol == PWM_TYPE_BRUSHED) && (motorConfig()->mincommand < 1000)){ motorConfigMutable()->mincommand = 1000; From 93d554516a2c1a3996c7781790b99f49fe404ee1 Mon Sep 17 00:00:00 2001 From: jflyper Date: Mon, 29 May 2017 13:30:21 +0900 Subject: [PATCH 2/2] Omit special case of USE_OSD_SLAVE and USE_QUAD_MIXER_ONLY --- src/main/fc/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 1caed29396..13b88fbe95 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -546,7 +546,7 @@ void activateConfig(void) void validateAndFixConfig(void) { -#if !defined(USE_UNCOMMON_MIXERS) || defined(USE_QUADX_MIXER_ONLY) +#if !defined(USE_UNCOMMON_MIXERS) && !defined(USE_QUAD_MIXER_ONLY) && !defined(USE_OSD_SLAVE) if (mixers[mixerConfigMutable()->mixerMode].motor == NULL) { mixerConfigMutable()->mixerMode = MIXER_CUSTOM; }