diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 10:12:09 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-12 10:12:09 +0200 |
| commit | e076b5a63632dc30cec83a8d2bb249a2d40f408a (patch) | |
| tree | a2a670c6c22ec72ee2efbd66354b3a3f1bc46362 /src/modules/mavlink/mavlink_messages.cpp | |
| parent | 342e08977ae5bf49c5ba941866e44fddefca4cda (diff) | |
| parent | 251760679a4bed86fdb10746062fde2cc23e460f (diff) | |
| download | px4-firmware-e076b5a63632dc30cec83a8d2bb249a2d40f408a.tar.gz px4-firmware-e076b5a63632dc30cec83a8d2bb249a2d40f408a.tar.bz2 px4-firmware-e076b5a63632dc30cec83a8d2bb249a2d40f408a.zip | |
Merge branch 'master' into mavlink_stack
Diffstat (limited to 'src/modules/mavlink/mavlink_messages.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 0430987ec..e0a148b53 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -1049,13 +1049,8 @@ public: private: MavlinkOrbSubscription *pos_sp_triplet_sub; - uint64_t pos_sp_triplet_time; protected: - explicit MavlinkStreamGlobalPositionSetpointInt() : MavlinkStream(), - pos_sp_triplet_time(0) - {} - void subscribe(Mavlink *mavlink) { pos_sp_triplet_sub = mavlink->add_orb_subscription(ORB_ID(position_setpoint_triplet)); @@ -1065,7 +1060,7 @@ protected: { struct position_setpoint_triplet_s pos_sp_triplet; - if (pos_sp_triplet_sub->update(&pos_sp_triplet_time, &pos_sp_triplet)) { + if (pos_sp_triplet_sub->update(&pos_sp_triplet)) { mavlink_msg_global_position_setpoint_int_send(_channel, MAV_FRAME_GLOBAL, (int32_t)(pos_sp_triplet.current.lat * 1e7), |