Browse Source

standard vtol: simplify blending weight calculation

Signed-off-by: Roman <bapstroman@gmail.com>
sbg
Roman 7 years ago committed by Roman Bapst
parent
commit
23257bf6ee
  1. 8
      src/modules/vtol_att_control/standard.cpp

8
src/modules/vtol_att_control/standard.cpp

@ -257,11 +257,9 @@ void Standard::update_transition_state() @@ -257,11 +257,9 @@ void Standard::update_transition_state()
_airspeed_trans_blend_margin;
// time based blending when no airspeed sensor is set
} else if (_params->airspeed_disabled &&
time_since_trans_start < _params->front_trans_time_min &&
time_since_trans_start > _params->front_trans_time_min / 2.0f) {
mc_weight = 1.0f - ((time_since_trans_start - _params->front_trans_time_min / 2.0f) /
(_params->front_trans_time_min / 2.0f));
} else if (_params->airspeed_disabled) {
mc_weight = 1.0f - (time_since_trans_start - _params->front_trans_time_min) / _params->front_trans_time_min;
mc_weight = math::constrain(2.0f * mc_weight, 0.0f, 1.0f);
}

Loading…
Cancel
Save