aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-03-05 20:58:58 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-03-05 20:58:58 +0100
commit616fd13d330f9c2550e5387e7129709582dbbb5b (patch)
treedba50c71fa1dc644321de8ca3e5746f6d99c13c1 /src
parent87fd89ea48dab591efd38c083e356d49b369bce9 (diff)
parent36ba60d63c024c23efdb4bba780ac98b5b257ee6 (diff)
downloadpx4-firmware-616fd13d330f9c2550e5387e7129709582dbbb5b.tar.gz
px4-firmware-616fd13d330f9c2550e5387e7129709582dbbb5b.tar.bz2
px4-firmware-616fd13d330f9c2550e5387e7129709582dbbb5b.zip
Merge remote-tracking branch 'upstream/master' into beta_fwtrim
Diffstat (limited to 'src')
-rw-r--r--src/modules/mc_att_control/mc_att_control_main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modules/mc_att_control/mc_att_control_main.cpp b/src/modules/mc_att_control/mc_att_control_main.cpp
index 24226880e..9cb8e8344 100644
--- a/src/modules/mc_att_control/mc_att_control_main.cpp
+++ b/src/modules/mc_att_control/mc_att_control_main.cpp
@@ -262,8 +262,10 @@ MulticopterAttitudeControl::MulticopterAttitudeControl() :
{
memset(&_v_att, 0, sizeof(_v_att));
memset(&_v_att_sp, 0, sizeof(_v_att_sp));
+ memset(&_v_rates_sp, 0, sizeof(_v_rates_sp));
memset(&_manual_control_sp, 0, sizeof(_manual_control_sp));
memset(&_v_control_mode, 0, sizeof(_v_control_mode));
+ memset(&_actuators, 0, sizeof(_actuators));
memset(&_armed, 0, sizeof(_armed));
_params.att_p.zero();