diff --git a/src/modules/vtol_att_control/tailsitter.cpp b/src/modules/vtol_att_control/tailsitter.cpp index 9ad93897ed..46640a4d89 100644 --- a/src/modules/vtol_att_control/tailsitter.cpp +++ b/src/modules/vtol_att_control/tailsitter.cpp @@ -54,8 +54,6 @@ Tailsitter::Tailsitter(VtolAttitudeControl *attc) : { _vtol_schedule.flight_mode = vtol_mode::MC_MODE; _vtol_schedule.transition_start = 0; - - _flag_was_in_trans_mode = false; } void diff --git a/src/modules/vtol_att_control/tailsitter.h b/src/modules/vtol_att_control/tailsitter.h index 36dd05b39a..e69483c7c3 100644 --- a/src/modules/vtol_att_control/tailsitter.h +++ b/src/modules/vtol_att_control/tailsitter.h @@ -74,6 +74,8 @@ private: hrt_abstime transition_start; /**< absoulte time at which front transition started */ } _vtol_schedule; + bool _flag_was_in_trans_mode = false; // true if mode has just switched to transition + matrix::Quatf _q_trans_start; matrix::Quatf _q_trans_sp; matrix::Vector3f _trans_rot_axis; diff --git a/src/modules/vtol_att_control/tiltrotor.cpp b/src/modules/vtol_att_control/tiltrotor.cpp index d0c8329323..1cd7b13d22 100644 --- a/src/modules/vtol_att_control/tiltrotor.cpp +++ b/src/modules/vtol_att_control/tiltrotor.cpp @@ -61,8 +61,6 @@ Tiltrotor::Tiltrotor(VtolAttitudeControl *attc) : _mc_roll_weight = 1.0f; _mc_pitch_weight = 1.0f; _mc_yaw_weight = 1.0f; - - _flag_was_in_trans_mode = false; } void @@ -296,11 +294,6 @@ void Tiltrotor::update_transition_state() float time_since_trans_start = (float)(hrt_absolute_time() - _vtol_schedule.transition_start) * 1e-6f; - if (!_flag_was_in_trans_mode) { - // save desired heading for transition and last thrust value - _flag_was_in_trans_mode = true; - } - if (_vtol_schedule.flight_mode == vtol_mode::TRANSITION_FRONT_P1) { // for the first part of the transition all rotors are enabled diff --git a/src/modules/vtol_att_control/vtol_type.h b/src/modules/vtol_att_control/vtol_type.h index f1f448ea8b..326373e760 100644 --- a/src/modules/vtol_att_control/vtol_type.h +++ b/src/modules/vtol_att_control/vtol_type.h @@ -202,8 +202,6 @@ protected: float _ra_hrate = 0.0f; // rolling average on height rate for quadchute condition float _ra_hrate_sp = 0.0f; // rolling average on height rate setpoint for quadchute condition - bool _flag_was_in_trans_mode = false; // true if mode has just switched to transition - hrt_abstime _trans_finished_ts = 0; bool _tecs_running = false;