Merge pull request #7126 from jflyper/bfdev-generic-handling-of-target-default-mixer

Remove (literal) target dependency from "TARGET_DEFAULT_MIXER"
This commit is contained in:
Michael Keller 2018-11-26 21:52:04 +13:00 committed by GitHub
commit 32068e3830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -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,
);

View File

@ -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

View File

@ -30,7 +30,7 @@
#endif
#define TARGET_DEFAULT_MIXER MIXER_QUADX_1234
#define DEFAULT_MIXER MIXER_QUADX_1234

View File

@ -332,3 +332,7 @@
#define USE_INVERTER
#endif
#endif
#ifndef DEFAULT_MIXER
#define DEFAULT_MIXER MIXER_QUADX
#endif