fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 11:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add the ability to reset a mixer group. Report the remaining buffer size from load_from_buf.

Browse Source
This commit is contained in:
px4dev
2012-12-29 12:58:10 -08:00
parent d5da457e29
commit 6ede0e2f18
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/systemlib/mixer/mixer_group.cpp
+15 -9
View File
@@ -64,14 +64,7 @@ MixerGroup::MixerGroup(ControlCallback control_cb, uintptr_t cb_handle) :
MixerGroup::~MixerGroup()
{
Mixer *mixer;
/* discard sub-mixers */
while (_first != nullptr) {
mixer = _first;
_first = mixer->_next;
delete mixer;
}
reset();
}
void
@@ -88,6 +81,19 @@ MixerGroup::add_mixer(Mixer *mixer)
mixer->_next = nullptr;
}
void
MixerGroup::reset()
{
Mixer *mixer;
/* discard sub-mixers */
while (_first != nullptr) {
mixer = _first;
_first = mixer->_next;
delete mixer;
}
}
unsigned
MixerGroup::mix(float *outputs, unsigned space)
{
@@ -114,7 +120,7 @@ MixerGroup::groups_required(uint32_t &groups)
}
int
MixerGroup::load_from_buf(const char *buf, unsigned buflen)
MixerGroup::load_from_buf(const char *buf, unsigned &buflen)
{
int ret = -1;
const char *end = buf + buflen;