Browse Source

MulticopterPositionControl: readd takeoff ramp fix

added in #14821 and accidentally removed in #14665
release/1.12
Matthias Grob 4 years ago
parent
commit
8fec39ad39
  1. 5
      src/modules/mc_pos_control/MulticopterPositionControl.cpp

5
src/modules/mc_pos_control/MulticopterPositionControl.cpp

@ -365,6 +365,11 @@ void MulticopterPositionControl::Run() @@ -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);

Loading…
Cancel
Save