Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-06 16:49:51 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Mixer test: Improve portability

Browse Source
This commit is contained in:
Lorenz Meier
2017-01-02 14:56:08 +01:00
committed by Daniel Agar
parent 5247f17576
commit 0d5089e3bf
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tests/test_mixer.cpp
+6 -6
View File
@@ -89,9 +89,9 @@ static bool should_prearm = false;
#endif
#if !defined(CONFIG_ARCH_BOARD_SITL)
#define MIXER_ONBOARD_PATH(_file) "/etc/mixers/"#_file
#define MIXER_ONBOARD_PATH "/etc/mixers/"
#else
#define MIXER_ONBOARD_PATH(_file) "ROMFS/px4fmu_common/mixers/"#_file
#define MIXER_ONBOARD_PATH "ROMFS/px4fmu_common/mixers/"
#endif
#define MIXER_VERBOSE
@@ -164,9 +164,9 @@ bool MixerTest::loadComplexTest()
bool MixerTest::loadAllTest()
{
PX4_INFO("Testing all mixers in %s", MIXER_ONBOARD_PATH());
PX4_INFO("Testing all mixers in %s", MIXER_ONBOARD_PATH);
DIR *dp = opendir(MIXER_ONBOARD_PATH());
DIR *dp = opendir(MIXER_ONBOARD_PATH);
if (dp == nullptr) {
PX4_ERR("File open failed");
@@ -207,8 +207,8 @@ bool MixerTest::loadAllTest()
if (strncmp(result->d_name, ".", 1) != 0) {
char buf[200];
(void)strncpy(&buf[0], MIXER_ONBOARD_PATH(), sizeof(buf));
(void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH())], result->d_name, sizeof(buf));
(void)strncpy(&buf[0], MIXER_ONBOARD_PATH, sizeof(buf));
(void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH)], result->d_name, sizeof(buf));
bool ret = load_mixer(buf, 0);