From 5536360c49432420fb36eb85abae83804446d7eb Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Thu, 13 Aug 2015 09:00:15 +0200 Subject: [PATCH] use vehicle_status instead of vtol_status --- src/modules/commander/commander.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 7a67077a8a..74e94d9e3d 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -2580,8 +2580,8 @@ set_control_mode() control_mode.flag_control_attitude_enabled = true; control_mode.flag_control_altitude_enabled = true; control_mode.flag_control_climb_rate_enabled = true; - control_mode.flag_control_position_enabled = !vtol_status.vtol_in_trans_mode; - control_mode.flag_control_velocity_enabled = !vtol_status.vtol_in_trans_mode; + control_mode.flag_control_position_enabled = !status.in_transition_mode; + control_mode.flag_control_velocity_enabled = !status.in_transition_mode; control_mode.flag_control_termination_enabled = false; break; @@ -2690,12 +2690,12 @@ set_control_mode() !offboard_control_mode.ignore_acceleration_force; control_mode.flag_control_velocity_enabled = (!offboard_control_mode.ignore_velocity || - !offboard_control_mode.ignore_position) && !vtol_status.vtol_in_trans_mode; + !offboard_control_mode.ignore_position) && !status.in_transition_mode; control_mode.flag_control_climb_rate_enabled = !offboard_control_mode.ignore_velocity || !offboard_control_mode.ignore_position; - control_mode.flag_control_position_enabled = !offboard_control_mode.ignore_position && !vtol_status.vtol_in_trans_mode; + control_mode.flag_control_position_enabled = !offboard_control_mode.ignore_position && !status.in_transition_mode; control_mode.flag_control_altitude_enabled = !offboard_control_mode.ignore_velocity || !offboard_control_mode.ignore_position;