diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:59:58 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-25 09:59:58 +0100 |
| commit | b376316fb19e497f76512a0353183936396e769d (patch) | |
| tree | 428bcd6ee1926b57a64cc47d903273225fb56ba4 /msg | |
| parent | 25af4b266ca48b183a1ad375856396f67d6ab30f (diff) | |
| parent | d8eefa30538331fde7e5ce79fef4e04dc62664bc (diff) | |
| download | px4-firmware-b376316fb19e497f76512a0353183936396e769d.tar.gz px4-firmware-b376316fb19e497f76512a0353183936396e769d.tar.bz2 px4-firmware-b376316fb19e497f76512a0353183936396e769d.zip | |
Merge remote-tracking branch 'upstream/isvtol' into dev_ros
Conflicts:
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_status.h
Diffstat (limited to 'msg')
| -rw-r--r-- | msg/vehicle_status.msg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/msg/vehicle_status.msg b/msg/vehicle_status.msg index 4d5d5ce09..21a088f12 100644 --- a/msg/vehicle_status.msg +++ b/msg/vehicle_status.msg @@ -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 |