fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-16 04:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2353 from andre-nguyen/offb_NaN_fix

Browse Source 
fix NaN yaw breaking attitude setpoints when going back into posctl from offboard
This commit is contained in:
Lorenz Meier
2015-06-13 00:01:24 +02:00
parent bcc49268ca 9605df75da
commit 3b0d766fd8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_receiver.cpp
+2 -2
View File
@@ -680,7 +680,7 @@ MavlinkReceiver::handle_message_set_position_target_local_ned(mavlink_message_t
}
/* set the yaw sp value */
if (!offboard_control_mode.ignore_attitude) {
if (!offboard_control_mode.ignore_attitude && !isnan(set_position_target_local_ned.yaw)) {
pos_sp_triplet.current.yaw_valid = true;
pos_sp_triplet.current.yaw = set_position_target_local_ned.yaw;
@@ -689,7 +689,7 @@ MavlinkReceiver::handle_message_set_position_target_local_ned(mavlink_message_t
}
/* set the yawrate sp value */
if (!offboard_control_mode.ignore_bodyrate) {
if (!offboard_control_mode.ignore_bodyrate && !isnan(set_position_target_local_ned.yaw)) {
pos_sp_triplet.current.yawspeed_valid = true;
pos_sp_triplet.current.yawspeed = set_position_target_local_ned.yaw_rate;
src/platforms/ros/nodes/mavlink/mavlink.cpp
+2 -2
View File
@@ -273,7 +273,7 @@ void Mavlink::handle_msg_set_position_target_local_ned(const mavlink_message_t *
}
/* set the yaw sp value */
if (!offboard_control_mode.ignore_attitude) {
if (!offboard_control_mode.ignore_attitude && !isnan(set_position_target_local_ned.yaw)) {
pos_sp_triplet.current.yaw_valid = true;
pos_sp_triplet.current.yaw = set_position_target_local_ned.yaw;
@@ -282,7 +282,7 @@ void Mavlink::handle_msg_set_position_target_local_ned(const mavlink_message_t *
}
/* set the yawrate sp value */
if (!offboard_control_mode.ignore_bodyrate) {
if (!offboard_control_mode.ignore_bodyrate && !isnan(set_position_target_local_ned.yaw)) {
pos_sp_triplet.current.yawspeed_valid = true;
pos_sp_triplet.current.yawspeed = set_position_target_local_ned.yaw_rate;