aboutsummaryrefslogtreecommitdiff
path: root/src/systemcmds
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-08 17:08:30 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-08 17:08:30 +0100
commitfb151a855f22e407eaa49db42851c90b6f1333f5 (patch)
treebda3de1a91b72d3ff9b06919c261b3ec37cfa83d /src/systemcmds
parentbb0d04212f31051fe4b71848c0a3b8adeb9b6e39 (diff)
parentaa2a00b56a0be0e20abfa54c311575f9e055f212 (diff)
downloadpx4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.gz
px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.bz2
px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.zip
Merge remote-tracking branch 'upstream/master' into ros
Diffstat (limited to 'src/systemcmds')
-rw-r--r--src/systemcmds/tests/test_mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp
index 8ab8fa2d6..2896a8e40 100644
--- a/src/systemcmds/tests/test_mixer.cpp
+++ b/src/systemcmds/tests/test_mixer.cpp
@@ -343,7 +343,7 @@ int test_mixer(int argc, char *argv[])
if (argc > 2)
filename = argv[2];
else
- filename = "/etc/mixers/FMU_quad_w.mix";
+ filename = "/etc/mixers/quad_w.main.mix";
load_mixer_file(filename, &buf[0], sizeof(buf));
loaded = strlen(buf);