diff options
| author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-07 00:25:06 +0200 |
|---|---|---|
| committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-08 00:53:52 +0200 |
| commit | 08062e6546f02cb2e819f690d35b485425788cc4 (patch) | |
| tree | 34707300cb69fc63bb89bdc31e3feabad08a84d1 /unittests | |
| parent | 74b63d08e1f2dd34b2c18be9d46d0837a9be5b9f (diff) | |
| download | px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.tar.gz px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.tar.bz2 px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.zip | |
Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu
Implemented automatic lookup for the .aux.mix file if it exists
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/conversion_test.cpp | 2 | ||||
| -rw-r--r-- | unittests/mixer_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unittests/conversion_test.cpp b/unittests/conversion_test.cpp index 99e1c7721..12d2213e2 100644 --- a/unittests/conversion_test.cpp +++ b/unittests/conversion_test.cpp @@ -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"; } diff --git a/unittests/mixer_test.cpp b/unittests/mixer_test.cpp index fd3ece7f8..1271dab5e 100644 --- a/unittests/mixer_test.cpp +++ b/unittests/mixer_test.cpp @@ -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"; } |