fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 18:23: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/lib/mixer_module/mixer_module.cpp
+4 -2
View File
@@ -33,6 +33,8 @@
#include "mixer_module.hpp"
#include <lib/mixer/MultirotorMixer.hpp>
#include <uORB/PublicationQueued.hpp>
#include <px4_platform_common/log.h>
@@ -543,7 +545,7 @@ void MixingOutput::resetMixer()
int MixingOutput::loadMixer(const char *buf, unsigned len)
{
if (_mixers == nullptr) {
_mixers = new MixerGroup(controlCallback, (uintptr_t)this);
_mixers = new MixerGroup();
}
if (_mixers == nullptr) {
@@ -551,7 +553,7 @@ int MixingOutput::loadMixer(const char *buf, unsigned len)
return -ENOMEM;
}
int ret = _mixers->load_from_buf(buf, len);
int ret = _mixers->load_from_buf(controlCallback, (uintptr_t)this, buf, len);
if (ret != 0) {
PX4_ERR("mixer load failed with %d", ret);
src/lib/mixer_module/mixer_module.hpp
+1 -2
View File
@@ -35,7 +35,7 @@
#include <board_config.h>
#include <drivers/drv_pwm_output.h>
#include <lib/mixer/mixer.h>
#include <lib/mixer/MixerGroup.hpp>
#include <lib/perf/perf_counter.h>
#include <lib/output_limit/output_limit.h>
#include <px4_platform_common/atomic.h>
@@ -52,7 +52,6 @@
#include <uORB/topics/parameter_update.h>
#include <uORB/topics/test_motor.h>
/**
* @class OutputModuleInterface
* Base class for an output module.