fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 15: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/drivers/tap_esc/tap_esc.cpp
+3 -4
View File
@@ -59,7 +59,7 @@
#include <drivers/drv_hrt.h>
#include <drivers/drv_mixer.h>
#include <mixer/mixer.h>
#include <lib/mixer/MixerGroup.hpp>
#include "tap_esc_common.h"
@@ -677,7 +677,7 @@ int TAP_ESC::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
unsigned buflen = strlen(buf);
if (_mixers == nullptr) {
_mixers = new MixerGroup(control_callback_trampoline, (uintptr_t)this);
_mixers = new MixerGroup();
}
if (_mixers == nullptr) {
@@ -685,8 +685,7 @@ int TAP_ESC::ioctl(cdev::file_t *filp, int cmd, unsigned long arg)
ret = -ENOMEM;
} else {
ret = _mixers->load_from_buf(buf, buflen);
ret = _mixers->load_from_buf(control_callback_trampoline, (uintptr_t)this, buf, buflen);
if (ret != 0) {
PX4_DEBUG("mixer load failed with %d", ret);