diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 13:03:53 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 13:03:53 +0200 |
| commit | e00d9407b92540f00dc88bdcfe728c737ec138d9 (patch) | |
| tree | bddfb05a5427606904a41cd71a764895c4671a12 /src/modules/mavlink/mavlink_messages.cpp | |
| parent | 0426fd3a52888277bcb612c57488e9de33432134 (diff) | |
| parent | 7f0b35a1b4c167ec2ebc2cb7c17fbbd7e032914e (diff) | |
| download | px4-firmware-e00d9407b92540f00dc88bdcfe728c737ec138d9.tar.gz px4-firmware-e00d9407b92540f00dc88bdcfe728c737ec138d9.tar.bz2 px4-firmware-e00d9407b92540f00dc88bdcfe728c737ec138d9.zip | |
Merged master
Diffstat (limited to 'src/modules/mavlink/mavlink_messages.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 2458dd23a..e1ebc16cc 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -259,8 +259,15 @@ protected: struct position_setpoint_triplet_s pos_sp_triplet; /* always send the heartbeat, independent of the update status of the topics */ - (void)status_sub->update(&status); - (void)pos_sp_triplet_sub->update(&pos_sp_triplet); + if (!status_sub->update(&status)) { + /* if topic update failed fill it with defaults */ + memset(&status, 0, sizeof(status)); + } + + if (!pos_sp_triplet_sub->update(&pos_sp_triplet)) { + /* if topic update failed fill it with defaults */ + memset(&pos_sp_triplet, 0, sizeof(pos_sp_triplet)); + } uint8_t mavlink_state = 0; uint8_t mavlink_base_mode = 0; |