let vtol attitude control module publish attitude setpoint during transition

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_att_control/fw_att_control_main.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
This commit is contained in:
Roman Bapst
2015-08-10 16:24:57 +02:00
committed by tumbili
parent 1f50041311
commit d55ccd96c6
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -1599,7 +1599,7 @@ int commander_thread_main(int argc, char *argv[])
orb_copy(ORB_ID(vtol_vehicle_status), vtol_vehicle_status_sub, &vtol_status);
status.vtol_fw_permanent_stab = vtol_status.fw_permanent_stab;
/* Make sure that this is only adjusted if vehicle really is of type vtol*/
/* Make sure that this is only adjusted if vehicle really is of type vtol */
if (is_vtol(&status)) {
status.is_rotary_wing = vtol_status.vtol_in_rw_mode;
status.in_transition_mode = vtol_status.vtol_in_trans_mode;