From 68da794db8b633ad6205300cb66cb6d4b78202ab Mon Sep 17 00:00:00 2001 From: jflyper Date: Sun, 25 Nov 2018 10:44:13 +0900 Subject: [PATCH] Remove (literal) target dependency --- src/main/flight/mixer.c | 6 +----- src/main/target/KISSFC/target.h | 2 +- src/main/target/REVOLT/target.h | 2 +- src/main/target/common_defaults_post.h | 4 ++++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/flight/mixer.c b/src/main/flight/mixer.c index fcf0ad606a..61100e2512 100644 --- a/src/main/flight/mixer.c +++ b/src/main/flight/mixer.c @@ -66,15 +66,11 @@ PG_REGISTER_WITH_RESET_TEMPLATE(mixerConfig_t, mixerConfig, PG_MIXER_CONFIG, 0); -#ifndef TARGET_DEFAULT_MIXER -#define TARGET_DEFAULT_MIXER MIXER_QUADX -#endif - #define DYN_LPF_THROTTLE_STEPS 100 #define DYN_LPF_THROTTLE_UPDATE_DELAY_US 5000 // minimum of 5ms between updates PG_RESET_TEMPLATE(mixerConfig_t, mixerConfig, - .mixerMode = TARGET_DEFAULT_MIXER, + .mixerMode = DEFAULT_MIXER, .yaw_motors_reversed = false, .crashflip_motor_percent = 0, ); diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h index 3856acf78d..baea6dc39f 100644 --- a/src/main/target/KISSFC/target.h +++ b/src/main/target/KISSFC/target.h @@ -52,7 +52,7 @@ #define USE_ACC_MPU6050 #define ACC_1_ALIGN CW90_DEG -#define TARGET_DEFAULT_MIXER MIXER_QUADX_1234 +#define DEFAULT_MIXER MIXER_QUADX_1234 #undef USE_LED_STRIP #else diff --git a/src/main/target/REVOLT/target.h b/src/main/target/REVOLT/target.h index dcf8dee680..13a17e5d4f 100644 --- a/src/main/target/REVOLT/target.h +++ b/src/main/target/REVOLT/target.h @@ -30,7 +30,7 @@ #endif -#define TARGET_DEFAULT_MIXER MIXER_QUADX_1234 +#define DEFAULT_MIXER MIXER_QUADX_1234 diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h index d78d755b7f..241aa9abf3 100644 --- a/src/main/target/common_defaults_post.h +++ b/src/main/target/common_defaults_post.h @@ -332,3 +332,7 @@ #define USE_INVERTER #endif #endif + +#ifndef DEFAULT_MIXER +#define DEFAULT_MIXER MIXER_QUADX +#endif