dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

fixing handling of attitude setpoints

This commit is contained in:
Andreas Antener 2015-03-15 12:10:53 +01:00
parent 030a96aa2c
commit 6f22cd07da
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/platforms/ros/nodes/mavlink/mavlink.cpp
View File

@ -162,16 +162,19 @@ void Mavlink::handle_msg_set_attitude_target(const mavlink_message_t *mmsg)
*/ */
att_sp.timestamp = get_time_micros(); att_sp.timestamp = get_time_micros();
mavlink_quaternion_to_euler(set_attitude_target.q, &att_sp.roll_body, &att_sp.pitch_body, if (!ignore_attitude) {
&att_sp.yaw_body); mavlink_quaternion_to_euler(set_attitude_target.q, &att_sp.roll_body, &att_sp.pitch_body,
mavlink_quaternion_to_dcm(set_attitude_target.q, (float(*)[3])att_sp.R_body.data()); &att_sp.yaw_body);
att_sp.R_valid = true; mavlink_quaternion_to_dcm(set_attitude_target.q, (float(*)[3])att_sp.R_body.data());
att_sp.R_valid = true;
}
if (!offboard_control_mode.ignore_thrust) { if (!offboard_control_mode.ignore_thrust) {
att_sp.thrust = set_attitude_target.thrust; att_sp.thrust = set_attitude_target.thrust;
} }
if (!offboard_control_mode.ignore_attitude) { if (!ignore_attitude) {
for (ssize_t i = 0; i < 4; i++) { for (ssize_t i = 0; i < 4; i++) {
att_sp.q_d[i] = set_attitude_target.q[i]; att_sp.q_d[i] = set_attitude_target.q[i];
} }