From 69f50bea8c99b1adb6b5caaa84f10a4cc390e7e3 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Thu, 5 Feb 2015 21:53:05 +0100 Subject: multiplat mc pos ctrl: reset yaw sp with alt sp This is a work-around until #1741 makes it to the multiplatform version --- src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp b/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp index f765b0b2d..b7fce5029 100644 --- a/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp +++ b/src/modules/mc_pos_control_multiplatform/mc_pos_control.cpp @@ -245,6 +245,10 @@ MulticopterPositionControl::reset_alt_sp() _reset_alt_sp = false; _pos_sp(2) = _pos(2) + (_vel(2) - _params.vel_ff(2) * _sp_move_rate(2)) / _params.pos_p(2); + //XXX hack until #1741 is in/ported + /* reset yaw sp */ + _att_sp_msg.data().yaw_body = _att->data().yaw; + //XXX: port this once a mavlink like interface is available // mavlink_log_info(_mavlink_fd, "[mpc] reset alt sp: %d", -(int)_pos_sp(2)); PX4_INFO("[mpc] reset alt sp: %2.3f", -(double)_pos_sp(2)); -- cgit v1.2.3