zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add reserved type, fixes #4466 (#4476) 

* Add reserved type, fixes #4466

* Additional reserved vtol types added to is_vtol
sbg
Sander Smeets 9 years ago committed by Lorenz Meier
parent
61d2987e6d
commit
1815b47fbf
1 changed files with 6 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/modules/commander/commander_helper.cpp

8
src/modules/commander/commander_helper.cpp
Unescape View File

@ -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) bool is_rotary_wing(const struct vehicle_status_s *current_status)
{ {
return is_multirotor(current_status) || (current_status->system_type == MAV_TYPE_HELICOPTER) 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) { bool is_vtol(const struct vehicle_status_s * current_status) {
return (current_status->system_type == MAV_TYPE_VTOL_DUOROTOR || return (current_status->system_type == MAV_TYPE_VTOL_DUOROTOR ||
current_status->system_type == MAV_TYPE_VTOL_QUADROTOR || 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 static hrt_abstime blink_msg_end = 0; // end time for currently blinking LED message, 0 if no blink message

Write Preview
Loading…
Cancel
Save