From 1815b47fbfb9b2f3dd64b62c5c5309042e23f6ea Mon Sep 17 00:00:00 2001 From: Sander Smeets Date: Sat, 7 May 2016 10:59:49 +0200 Subject: [PATCH] Add reserved type, fixes #4466 (#4476) * Add reserved type, fixes #4466 * Additional reserved vtol types added to is_vtol --- src/modules/commander/commander_helper.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/commander/commander_helper.cpp b/src/modules/commander/commander_helper.cpp index 854b2e6934..812e2ed09d 100644 --- a/src/modules/commander/commander_helper.cpp +++ b/src/modules/commander/commander_helper.cpp @@ -88,13 +88,17 @@ bool is_multirotor(const struct vehicle_status_s *current_status) bool is_rotary_wing(const struct vehicle_status_s *current_status) { return is_multirotor(current_status) || (current_status->system_type == MAV_TYPE_HELICOPTER) - || (current_status->system_type == MAV_TYPE_COAXIAL); + || (current_status->system_type == MAV_TYPE_COAXIAL); } bool is_vtol(const struct vehicle_status_s * current_status) { return (current_status->system_type == MAV_TYPE_VTOL_DUOROTOR || current_status->system_type == MAV_TYPE_VTOL_QUADROTOR || - current_status->system_type == MAV_TYPE_VTOL_TILTROTOR); + current_status->system_type == MAV_TYPE_VTOL_TILTROTOR || + current_status->system_type == MAV_TYPE_VTOL_RESERVED2 || + current_status->system_type == MAV_TYPE_VTOL_RESERVED3 || + current_status->system_type == MAV_TYPE_VTOL_RESERVED4 || + current_status->system_type == MAV_TYPE_VTOL_RESERVED5); } static hrt_abstime blink_msg_end = 0; // end time for currently blinking LED message, 0 if no blink message