fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-14 06:50:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ros

Browse Source
This commit is contained in:
Thomas Gubler
2015-01-08 17:08:30 +01:00
parent bb0d04212f aa2a00b56a
commit fb151a855f
61 changed files with 147 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tests/test_mixer.cpp
+1 -1
View File
@@ -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);