diff options
author | Julian Oes <julian@oes.ch> | 2014-06-11 13:29:28 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-06-11 13:29:28 +0200 |
commit | cfcba921a1a06b6f102ad227c3f6da3f977891c0 (patch) | |
tree | d114cad842a290ef97485b30e6c1323f7dfdd205 /src | |
parent | 6f24afd68a840698a9a77b46bc8f1ca81cc1f5b9 (diff) | |
parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
download | px4-firmware-cfcba921a1a06b6f102ad227c3f6da3f977891c0.tar.gz px4-firmware-cfcba921a1a06b6f102ad227c3f6da3f977891c0.tar.bz2 px4-firmware-cfcba921a1a06b6f102ad227c3f6da3f977891c0.zip |
Merge remote-tracking branch 'px4/master' into navigator_rewrite
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index d1b943eab..e7d2ba515 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -959,14 +959,14 @@ protected: void send(const hrt_abstime t) { - if (pos_sp_triplet_sub->update(t)) { - mavlink_msg_global_position_setpoint_int_send(_channel, - MAV_FRAME_GLOBAL, - (int32_t)(pos_sp_triplet->current.lat * 1e7), - (int32_t)(pos_sp_triplet->current.lon * 1e7), - (int32_t)(pos_sp_triplet->current.alt * 1000), - (int16_t)(pos_sp_triplet->current.yaw * M_RAD_TO_DEG_F * 100.0f)); - } + /* always send this message, even if it has not been updated */ + pos_sp_triplet_sub->update(t); + mavlink_msg_global_position_setpoint_int_send(_channel, + MAV_FRAME_GLOBAL, + (int32_t)(pos_sp_triplet->current.lat * 1e7), + (int32_t)(pos_sp_triplet->current.lon * 1e7), + (int32_t)(pos_sp_triplet->current.alt * 1000), + (int16_t)(pos_sp_triplet->current.yaw * M_RAD_TO_DEG_F * 100.0f)); } }; |