From 93bc8f6467dc559a96b51abde2dbb819a5912e65 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Wed, 18 Jan 2017 15:58:05 -1000 Subject: [PATCH] Combined ifdess and made positive logic We still allow CONFIG_ARCH_BOARD_SITL in the code base, but use positive logic and less #ifdefs --- src/systemcmds/tests/test_mixer.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index 33b33b3475..fba45fd166 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -91,17 +91,14 @@ static bool should_prearm = false; #endif #endif -#if !defined(CONFIG_ARCH_BOARD_SITL) -#define MIXER_PATH(_file) "/etc/mixers/"#_file +#if defined(CONFIG_ARCH_BOARD_SITL) +#define MIXER_PATH(_file) "ROMFS/px4fmu_test/mixers/"#_file +#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers" #else -#define MIXER_PATH(_file) "ROMFS/px4fmu_test/mixers/"#_file +#define MIXER_ONBOARD_PATH "/etc/mixers" +#define MIXER_PATH(_file) MIXER_ONBOARD_PATH"/"#_file #endif -#if !defined(CONFIG_ARCH_BOARD_SITL) -#define MIXER_ONBOARD_PATH "/etc/mixers" -#else -#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers" -#endif #define MIXER_VERBOSE