Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-07 17:35:22 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Combined ifdess and made positive logic

Browse Source 
We still allow CONFIG_ARCH_BOARD_SITL in the code base, but
  use positive logic and less #ifdefs
This commit is contained in:
David Sidrane
2017-01-18 15:58:05 -10:00
committed by Lorenz Meier
parent 0bb0e92378
commit 93bc8f6467
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tests/test_mixer.cpp
+5 -8
View File
@@ -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