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

MulticopterPositionControl: readd takeoff ramp fix 

added in #14821 and accidentally removed in #14665
This commit is contained in:
Matthias Grob 2021-03-31 13:46:34 +02:00
parent 752bc9ebce
commit 8fec39ad39
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/mc_pos_control/MulticopterPositionControl.cpp
View File

@ -365,6 +365,11 @@ void MulticopterPositionControl::Run()
const bool flying = (_takeoff.getTakeoffState() >= TakeoffState::flight);
const bool flying_but_ground_contact = (flying && _vehicle_land_detected.ground_contact);
// make sure takeoff ramp is not amended by acceleration feed-forward
if (!flying) {
_setpoint.acceleration[2] = NAN;
}
if (not_taken_off || flying_but_ground_contact) {
// we are not flying yet and need to avoid any corrections
reset_setpoint_to_nan(_setpoint);