Browse Source

Merge pull request #2693 from PX4/transition_flag_fix

mc_pos_controller: fix logic for att sp publication
sbg
Roman Bapst 10 years ago
parent
commit
1b50aba43f
  1. 2
      src/modules/mc_pos_control/mc_pos_control_main.cpp

2
src/modules/mc_pos_control/mc_pos_control_main.cpp

@ -1466,7 +1466,7 @@ MulticopterPositionControl::task_main() @@ -1466,7 +1466,7 @@ MulticopterPositionControl::task_main()
_control_mode.flag_control_velocity_enabled))) {
if (_att_sp_pub != nullptr && (_vehicle_status.is_rotary_wing || _vehicle_status.in_transition_mode)) {
orb_publish(ORB_ID(vehicle_attitude_setpoint), _att_sp_pub, &_att_sp);
} else if (_att_sp_pub == nullptr && _vehicle_status.is_rotary_wing){
} else if (_att_sp_pub == nullptr && (_vehicle_status.is_rotary_wing || _vehicle_status.in_transition_mode)) {
_att_sp_pub = orb_advertise(ORB_ID(vehicle_attitude_setpoint), &_att_sp);
}
}

Loading…
Cancel
Save