diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-03 15:30:38 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-11-03 15:30:38 +0100 |
| commit | 1aef7c502cc50b724a3eb47c05dcdb5bec6de4a3 (patch) | |
| tree | f12957d2cc41d36b8b0b6b4f2a40923f489397b2 /src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | |
| parent | 3b76959df5fd6cf4f0711f3e9045e53c70722ee3 (diff) | |
| parent | 5fec5fecdc3980c973cb8c6ad23a013c8214ace7 (diff) | |
| download | px4-firmware-1aef7c502cc50b724a3eb47c05dcdb5bec6de4a3.tar.gz px4-firmware-1aef7c502cc50b724a3eb47c05dcdb5bec6de4a3.tar.bz2 px4-firmware-1aef7c502cc50b724a3eb47c05dcdb5bec6de4a3.zip | |
Merge branch 'fw_autoland' into fw_autoland_att_tecs
Diffstat (limited to 'src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp')
| -rw-r--r-- | src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp index 5f91eb61d..50a54c792 100644 --- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp +++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp @@ -800,7 +800,7 @@ FixedwingPositionControl::control_position(const math::Vector2f ¤t_positio /* apply minimum pitch (flare) and limit roll if close to touch down, altitude error is negative (going down) */ // XXX this could make a great param - float flare_angle_rad = math::radians(10.0f);//math::radians(global_triplet.current.param1) + float flare_angle_rad = -math::radians(5.0f);//math::radians(global_triplet.current.param1) float land_pitch_min = math::radians(5.0f); float throttle_land = _parameters.throttle_min + (_parameters.throttle_max - _parameters.throttle_min) * 0.1f; float airspeed_land = _parameters.airspeed_min; |