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

Merge remote-tracking branch 'upstream/isvtol' into dev_ros

Browse Source 
Conflicts:
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
This commit is contained in:
Thomas Gubler
2014-12-25 09:59:58 +01:00
parent 25af4b266c d8eefa3053
commit b376316fb1
5 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/vehicle_status.msg
+2 -1
View File
@@ -94,7 +94,8 @@ int32 system_type # system type, inspired by MAVLink's VEHICLE_TYPE enum
int32 system_id # system id, inspired by MAVLink's system ID field
int32 component_id # subsystem / component id, inspired by MAVLink's component ID field
bool is_rotary_wing
bool is_rotary_wing # True if system is in rotary wing configuration, so for a VTOL this is only true while flying as a multicopter
bool is_vtol # True if the system is VTOL capable
bool condition_battery_voltage_valid
bool condition_system_in_air_restore # true if we can restore in mid air