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

fw autoland: move constrain of roll to horizontal landing navigation 

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
This commit is contained in:
Thomas Gubler 2013-11-24 08:32:53 +01:00
parent 37ef10ceea
commit 0611b26eea
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
View File

@ -837,6 +837,9 @@ FixedwingPositionControl::control_position(const math::Vector2f &current_positio
_l1_control.navigate_heading(target_bearing, _att.yaw, ground_speed);
/* limit roll motion to prevent wings from touching the ground first */
_att_sp.roll_body = math::constrain(_att_sp.roll_body, math::radians(-10.0f), math::radians(10.0f));
land_noreturn_horizontal = true;
} else {
@ -911,8 +914,6 @@ FixedwingPositionControl::control_position(const math::Vector2f &current_positio
0.0f, throttle_max, throttle_land,
flare_angle_rad, math::radians(15.0f));
/* limit roll motion to prevent wings from touching the ground first */
_att_sp.roll_body = math::constrain(_att_sp.roll_body, math::radians(-10.0f), math::radians(10.0f));
if (!land_noreturn_vertical) {
mavlink_log_info(mavlink_fd, "[POSCTRL] Landing, flare");
land_noreturn_vertical = true;