zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Plane: fixed force descend in VTOL land

mission-4.1.18
Andrew Tridgell 9 years ago
parent
4592085963
commit
780d1459f0
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ArduPlane/quadplane.cpp

4
ArduPlane/quadplane.cpp
Unescape View File

@ -868,11 +868,11 @@ void QuadPlane::control_auto(const Location &loc)
switch (plane.mission.get_current_nav_cmd().id) { switch (plane.mission.get_current_nav_cmd().id) {
case MAV_CMD_NAV_VTOL_LAND: case MAV_CMD_NAV_VTOL_LAND:
if (plane.auto_state.wp_distance > 2) { if (plane.auto_state.wp_distance > 2) {
pos_control->set_alt_target_from_climb_rate_ff(0, plane.G_Dt, true); pos_control->set_alt_target_from_climb_rate_ff(0, plane.G_Dt, false);
} else if (plane.current_loc.alt > plane.next_WP_loc.alt+5*100) { } else if (plane.current_loc.alt > plane.next_WP_loc.alt+5*100) {
pos_control->set_alt_target_with_slew(wp_nav->get_loiter_target().z, plane.ins.get_loop_delta_t()); pos_control->set_alt_target_with_slew(wp_nav->get_loiter_target().z, plane.ins.get_loop_delta_t());
} else { } else {
pos_control->set_alt_target_from_climb_rate_ff(-30, plane.G_Dt, false); pos_control->set_alt_target_from_climb_rate_ff(-30, plane.G_Dt, true);
} }
break; break;
case MAV_CMD_NAV_VTOL_TAKEOFF: case MAV_CMD_NAV_VTOL_TAKEOFF:

Write Preview
Loading…
Cancel
Save