diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 11:48:44 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-29 11:48:44 +0200 |
commit | aa7781d09baabcd1ecc517b7dc07ca0e198094da (patch) | |
tree | b446b913ac8988f58f33038d9d7407c97a35a2e3 /src | |
parent | cd2867925797b291d6bc1f2a67b53d2e34067bba (diff) | |
parent | 9e5c94b41e6e4d0b5869c80ee4f6248bedffe7b4 (diff) | |
download | px4-firmware-aa7781d09baabcd1ecc517b7dc07ca0e198094da.tar.gz px4-firmware-aa7781d09baabcd1ecc517b7dc07ca0e198094da.tar.bz2 px4-firmware-aa7781d09baabcd1ecc517b7dc07ca0e198094da.zip |
Merge pull request #1081 from PX4/hb_fix2
mavlink: init structs for HEARTBEAT if uORB topic copy failed
Diffstat (limited to 'src')
-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 b295bf35f..ef9039a6a 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -227,8 +227,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; |