aboutsummaryrefslogtreecommitdiff
path: root/apps/systemlib
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-03-07 19:47:43 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-03-07 19:47:43 +0100
commitebac51cad8e144b64938e6726e26bdc23aaf45e5 (patch)
tree918bbe5135e9d27754ad6bd6719a075cf58f0f71 /apps/systemlib
parent7013eb5e10c63f0d2be5b82d0fdeff31166f5000 (diff)
downloadpx4-firmware-ebac51cad8e144b64938e6726e26bdc23aaf45e5.tar.gz
px4-firmware-ebac51cad8e144b64938e6726e26bdc23aaf45e5.tar.bz2
px4-firmware-ebac51cad8e144b64938e6726e26bdc23aaf45e5.zip
Working on restart resilience, hunting down multi-load mixer issue (still present)
Diffstat (limited to 'apps/systemlib')
-rw-r--r--apps/systemlib/mixer/mixer.cpp1
-rw-r--r--apps/systemlib/mixer/mixer_group.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/apps/systemlib/mixer/mixer.cpp b/apps/systemlib/mixer/mixer.cpp
index 72f765d90..df0dfe838 100644
--- a/apps/systemlib/mixer/mixer.cpp
+++ b/apps/systemlib/mixer/mixer.cpp
@@ -54,6 +54,7 @@
#include "mixer.h"
Mixer::Mixer(ControlCallback control_cb, uintptr_t cb_handle) :
+ _next(nullptr),
_control_cb(control_cb),
_cb_handle(cb_handle)
{
diff --git a/apps/systemlib/mixer/mixer_group.cpp b/apps/systemlib/mixer/mixer_group.cpp
index 60eeff225..1dbc512cd 100644
--- a/apps/systemlib/mixer/mixer_group.cpp
+++ b/apps/systemlib/mixer/mixer_group.cpp
@@ -93,6 +93,7 @@ MixerGroup::reset()
mixer = _first;
_first = mixer->_next;
delete mixer;
+ mixer = nullptr;
}
}