fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 18:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

mixer: move MixerGroup out of Mixer hierarchy and delete mixer.h header

Browse Source
This commit is contained in:
Daniel Agar
2019-11-22 15:00:25 -05:00
parent 011186b8a5
commit 79dc676c8f
36 changed files with 233 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/mixer/mixer.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
#include <ctype.h>
#include <drivers/drv_mixer.h>
#include <lib/mixer/mixer.h>
#include <lib/mixer/Mixer.hpp>
#include <lib/mixer/mixer_load.h>
#include <uORB/topics/actuator_controls.h>
src/systemcmds/tests/test_autodeclination.cpp
-1
View File
@@ -43,7 +43,6 @@
#include <ecl/geo_lookup/geo_mag_declination.h>
#include <px4iofirmware/px4io.h>
#include <systemlib/err.h>
#include <lib/mixer/mixer.h>
#include <math.h>
#include <stdio.h>
src/systemcmds/tests/test_mixer.cpp
+7 -15
View File
@@ -43,8 +43,8 @@
#include <math.h>
#include <px4_platform_common/px4_config.h>
#include <mixer/mixer.h>
#include <mixer/mixer_load.h>
#include <lib/mixer/MixerGroup.hpp>
#include <lib/mixer/mixer_load.h>
#include <output_limit/output_limit.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_pwm_output.h>
@@ -95,7 +95,7 @@ class MixerTest : public UnitTest
{
public:
virtual bool run_tests();
MixerTest();
MixerTest() = default;
private:
bool mixerTest();
@@ -112,11 +112,6 @@ private:
MixerGroup mixer_group;
};
MixerTest::MixerTest() :
mixer_group(mixer_callback, 0)
{
}
bool MixerTest::run_tests()
{
ut_run_test(loadIOPass);
@@ -251,11 +246,8 @@ bool MixerTest::load_mixer(const char *filename, unsigned expected_count, bool v
}
bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loaded, unsigned expected_count,
const unsigned chunk_size,
bool verbose)
const unsigned chunk_size, bool verbose)
{
/* load the mixer in chunks, like
* in the case of a remote load,
* e.g. on PX4IO.
@@ -264,7 +256,7 @@ bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loade
/* load at once test */
unsigned xx = loaded;
mixer_group.reset();
mixer_group.load_from_buf(&buf[0], xx);
mixer_group.load_from_buf(mixer_callback, 0, &buf[0], xx);
if (expected_count > 0) {
ut_compare("check number of mixers loaded", mixer_group.count(), expected_count);
@@ -275,7 +267,7 @@ bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loade
empty_buf[0] = ' ';
empty_buf[1] = '\0';
mixer_group.reset();
mixer_group.load_from_buf(&empty_buf[0], empty_load);
mixer_group.load_from_buf(mixer_callback, 0, &empty_buf[0], empty_load);
if (verbose) {
PX4_INFO("empty buffer load: loaded %u mixers, used: %u", mixer_group.count(), empty_load);
@@ -310,7 +302,7 @@ bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loade
/* process the text buffer, adding new mixers as their descriptions can be parsed */
resid = mixer_text_length;
mixer_group.load_from_buf(&mixer_text[0], resid);
mixer_group.load_from_buf(mixer_callback, 0, &mixer_text[0], resid);
/* if anything was parsed */
if (resid != mixer_text_length) {