diff --git a/src/modules/vtol_att_control/standard.cpp b/src/modules/vtol_att_control/standard.cpp index 41e5a4a432..385ee40647 100644 --- a/src/modules/vtol_att_control/standard.cpp +++ b/src/modules/vtol_att_control/standard.cpp @@ -314,11 +314,6 @@ void Standard::update_transition_state() } set_all_motor_state(motor_state::ENABLED); - - // set idle speed for MC actuators - if (!_flag_idle_mc) { - _flag_idle_mc = set_idle_mc(); - } } mc_weight = math::constrain(mc_weight, 0.0f, 1.0f); diff --git a/src/modules/vtol_att_control/tailsitter.cpp b/src/modules/vtol_att_control/tailsitter.cpp index 2a7cda3f57..f91d0aee4f 100644 --- a/src/modules/vtol_att_control/tailsitter.cpp +++ b/src/modules/vtol_att_control/tailsitter.cpp @@ -244,10 +244,6 @@ void Tailsitter::update_transition_state() const float trans_pitch_rate = M_PI_2_F / _params->back_trans_duration; - if (!_flag_idle_mc) { - _flag_idle_mc = set_idle_mc(); - } - if (tilt > 0.01f) { _q_trans_sp = Quatf(AxisAnglef(_trans_rot_axis, time_since_trans_start * trans_pitch_rate)) * _q_trans_start; diff --git a/src/modules/vtol_att_control/tiltrotor.cpp b/src/modules/vtol_att_control/tiltrotor.cpp index b5794c6a8f..b8b4b43fa1 100644 --- a/src/modules/vtol_att_control/tiltrotor.cpp +++ b/src/modules/vtol_att_control/tiltrotor.cpp @@ -366,12 +366,6 @@ void Tiltrotor::update_transition_state() // turn on all MC motors set_all_motor_state(motor_state::ENABLED); - - // set idle speed for rotary wing mode - if (!_flag_idle_mc) { - _flag_idle_mc = set_idle_mc(); - } - // tilt rotors back if (_tilt_control > _params_tiltrotor.tilt_mc) { _tilt_control = _params_tiltrotor.tilt_fw - diff --git a/src/modules/vtol_att_control/vtol_type.cpp b/src/modules/vtol_att_control/vtol_type.cpp index af1c44c122..04c0ce3521 100644 --- a/src/modules/vtol_att_control/vtol_type.cpp +++ b/src/modules/vtol_att_control/vtol_type.cpp @@ -136,9 +136,7 @@ bool VtolType::init() void VtolType::update_mc_state() { - if (!_flag_idle_mc) { - _flag_idle_mc = set_idle_mc(); - } + set_idle_mc(); resetAccelToPitchPitchIntegrator(); @@ -155,9 +153,7 @@ void VtolType::update_mc_state() void VtolType::update_fw_state() { - if (_flag_idle_mc) { - _flag_idle_mc = !set_idle_fw(); - } + set_idle_fw(); resetAccelToPitchPitchIntegrator(); diff --git a/src/modules/vtol_att_control/vtol_type.h b/src/modules/vtol_att_control/vtol_type.h index 39fe12663d..0927933688 100644 --- a/src/modules/vtol_att_control/vtol_type.h +++ b/src/modules/vtol_att_control/vtol_type.h @@ -218,8 +218,6 @@ protected: struct Params *_params; - bool _flag_idle_mc = false; //false = "idle is set for fixed wing mode"; true = "idle is set for multicopter mode" - bool _pusher_active = false; float _mc_roll_weight = 1.0f; // weight for multicopter attitude controller roll output float _mc_pitch_weight = 1.0f; // weight for multicopter attitude controller pitch output