Browse Source

run l1 during transition

sbg
RomanBapst 5 years ago committed by Roman Bapst
parent
commit
b6a80253d7
  1. 3
      src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
  2. 4
      src/modules/vtol_att_control/standard.cpp

3
src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp

@ -1578,8 +1578,9 @@ FixedwingPositionControl::Run() @@ -1578,8 +1578,9 @@ FixedwingPositionControl::Run()
// only publish status in full FW mode
if (_vehicle_status.vehicle_type == vehicle_status_s::VEHICLE_TYPE_FIXED_WING
&& !_vehicle_status.in_transition_mode) {
|| _vehicle_status.in_transition_mode) {
status_publish();
}
}
}

4
src/modules/vtol_att_control/standard.cpp

@ -264,6 +264,9 @@ void Standard::update_transition_state() @@ -264,6 +264,9 @@ void Standard::update_transition_state()
// ramp up FW_PSP_OFF
_v_att_sp->pitch_body = _params_standard.pitch_setpoint_offset * (1.0f - mc_weight);
_v_att_sp->roll_body = _fw_virtual_att_sp->roll_body;
const Quatf q_sp(Eulerf(_v_att_sp->roll_body, _v_att_sp->pitch_body, _v_att_sp->yaw_body));
q_sp.copyTo(_v_att_sp->q_d);
@ -279,6 +282,7 @@ void Standard::update_transition_state() @@ -279,6 +282,7 @@ void Standard::update_transition_state()
// maintain FW_PSP_OFF
_v_att_sp->pitch_body = _params_standard.pitch_setpoint_offset;
_v_att_sp->roll_body = _fw_virtual_att_sp->roll_body;
const Quatf q_sp(Eulerf(_v_att_sp->roll_body, _v_att_sp->pitch_body, _v_att_sp->yaw_body));
q_sp.copyTo(_v_att_sp->q_d);

Loading…
Cancel
Save