diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 10d5be8de6..abf357b63e 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -464,6 +464,11 @@ void resetRcControlsConfig(rcControlsConfig_t *rcControlsConfig) void resetMixerConfig(mixerConfig_t *mixerConfig) { +#ifdef TARGET_DEFAULT_MIXER + mixerConfig->mixerMode = TARGET_DEFAULT_MIXER; +#else + mixerConfig->mixerMode = MIXER_QUADX; +#endif mixerConfig->yaw_motor_direction = 1; } @@ -602,7 +607,6 @@ void createDefaultConfig(master_t *config) #endif config->version = EEPROM_CONF_VERSION; - config->mixerConfig.mixerMode = MIXER_QUADX; // global settings config->current_profile_index = 0; // default profile diff --git a/src/main/target/REVO/target.c b/src/main/target/REVO/target.c index 36d9708128..ee60c575c2 100644 --- a/src/main/target/REVO/target.c +++ b/src/main/target/REVO/target.c @@ -32,10 +32,10 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM8, CH3, PC8, TIM_USE_PWM, 0, 0), // S5_IN DEF_TIM(TIM8, CH4, PC9, TIM_USE_PWM, 0, 0), // S6_IN #ifdef REVOLT - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 1, 1), // S3_OUT D1_ST6 - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1, 0), // S2_OUT D1_ST2 - DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1, 0), // S4_OUT D1_ST1 DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1, 0), // S1_OUT D1_ST7 + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 1, 0), // S2_OUT D1_ST2 + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 1, 1), // S3_OUT D1_ST6 + DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 1, 0), // S4_OUT D1_ST1 DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // LED for REVOLT D1_ST0 #else DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 1, 0), // S1_OUT D1_ST7 diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h index fe7dc33dc2..a93fdc3813 100644 --- a/src/main/target/REVO/target.h +++ b/src/main/target/REVO/target.h @@ -26,6 +26,7 @@ #elif defined(REVOLT) #define TARGET_BOARD_IDENTIFIER "RVLT" #define USBD_PRODUCT_STRING "Revolt" +#define TARGET_DEFAULT_MIXER MIXER_QUADX_1234 #elif defined(SOULF4) #define TARGET_BOARD_IDENTIFIER "SOUL"