fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 21:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

vehicle_status: move vtol_vehicle_status enum

Browse Source 
It makes more sense to have the VTOL status in its own message.
This commit is contained in:
Julian Oes
2016-04-11 18:01:47 +02:00
parent 74072dbe74
commit 8e9e9f8a8b
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vtol_att_control/vtol_att_control_main.cpp
+3 -3
View File
@@ -467,7 +467,7 @@ VtolAttitudeControl::is_fixed_wing_requested()
// listen to transition commands if not in manual
if (!_v_control_mode.flag_control_manual_enabled) {
to_fw = _transition_command == vehicle_status_s::VEHICLE_VTOL_STATE_FW;
to_fw = _transition_command == vtol_vehicle_status_s::VEHICLE_VTOL_STATE_FW;
}
// handle abort request
@@ -699,10 +699,10 @@ void VtolAttitudeControl::task_main()
// reset transition command if not auto control
if (_v_control_mode.flag_control_manual_enabled) {
if (_vtol_type->get_mode() == ROTARY_WING) {
_transition_command = vehicle_status_s::VEHICLE_VTOL_STATE_MC;
_transition_command = vtol_vehicle_status_s::VEHICLE_VTOL_STATE_MC;
} else if (_vtol_type->get_mode() == FIXED_WING) {
_transition_command = vehicle_status_s::VEHICLE_VTOL_STATE_FW;
_transition_command = vtol_vehicle_status_s::VEHICLE_VTOL_STATE_FW;
}
}