fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-01 09:50: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-20 21:26:43 -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/driver_framework_wrapper/df_bebop_bus_wrapper/df_bebop_bus_wrapper.cpp
+3 -3
View File
@@ -56,7 +56,7 @@
#include <uORB/topics/battery_status.h>
#include <uORB/topics/esc_status.h>
#include <lib/mixer/mixer.h>
#include <lib/mixer/MixerGroup.hpp>
#include <lib/mixer/mixer_load.h>
#include <battery/battery.h>
@@ -307,7 +307,7 @@ int initialize_mixers(const char *mixers_filename)
}
if (_mixers == nullptr) {
_mixers = new MixerGroup(mixers_control_callback, (uintptr_t)_controls);
_mixers = new MixerGroup();
}
if (_mixers == nullptr) {
@@ -315,7 +315,7 @@ int initialize_mixers(const char *mixers_filename)
return -1;
} else {
int ret = _mixers->load_from_buf(buf, buflen);
int ret = _mixers->load_from_buf(mixers_control_callback, (uintptr_t)_controls, buf, buflen);
if (ret != 0) {
PX4_ERR("Unable to parse mixers file");