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

Merge branch 'MixerNaming' of github.com:anton-matosov/Firmware

Browse Source
This commit is contained in:
Lorenz Meier
2015-01-08 12:45:43 +01:00
parent 1df7939072 e405fafe88
commit aa2a00b56a
57 changed files with 135 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unittests/conversion_test.cpp
+1 -1
View File
@@ -4,6 +4,6 @@
#include "gtest/gtest.h"
TEST(ConversionTest, FMU_quad_w) {
TEST(ConversionTest, quad_w_main) {
ASSERT_EQ(test_conv(0, NULL), 0) << "Conversion test failed";
}
unittests/mixer_test.cpp
+1 -1
View File
@@ -6,6 +6,6 @@
TEST(MixerTest, Mixer) {
char* args[] = {"empty", "../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../ROMFS/px4fmu_common/mixers/FMU_quad_w.mix"};
char* args[] = {"empty", "../ROMFS/px4fmu_common/mixers/IO_pass.mix", "../ROMFS/px4fmu_common/mixers/quad_w.main.mix"};
ASSERT_EQ(test_mixer(3, args), 0) << "IO_pass.mix failed";
}