Browse Source

Merge pull request #1081 from PX4/hb_fix2

mavlink: init structs for HEARTBEAT if uORB topic copy failed
sbg
Lorenz Meier 11 years ago
parent
commit
aa7781d09b
  1. 11
      src/modules/mavlink/mavlink_messages.cpp

11
src/modules/mavlink/mavlink_messages.cpp

@ -227,8 +227,15 @@ protected: @@ -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;

Loading…
Cancel
Save