diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-05 10:02:07 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-05 10:02:07 +0100 |
| commit | 16b9f666e790a2b939f7890b39cc6e4cf2552165 (patch) | |
| tree | ee936b06d15e75e12b175f6786772781aff32cd8 /msg | |
| parent | e16c4ff76e7eff2da88bcbef5d05dd4ba11e7203 (diff) | |
| parent | c3ed35f5cc8e2617e61747e904dbaa652d1cc2c8 (diff) | |
| download | px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.tar.gz px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.tar.bz2 px4-firmware-16b9f666e790a2b939f7890b39cc6e4cf2552165.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
src/lib/mathlib/math/Matrix.hpp
src/modules/mc_att_control/mc_att_control_main.cpp
src/modules/uORB/topics/vehicle_status.h
src/platforms/px4_includes.h
Diffstat (limited to 'msg')
| -rw-r--r-- | msg/vehicle_status.msg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/msg/vehicle_status.msg b/msg/vehicle_status.msg index 21a088f12..18df3252f 100644 --- a/msg/vehicle_status.msg +++ b/msg/vehicle_status.msg @@ -96,6 +96,7 @@ int32 component_id # subsystem / component id, inspired by MAVLink's component 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 vtol_fw_permanent_stab # True if vtol should stabilize attitude for fw in manual mode bool condition_battery_voltage_valid bool condition_system_in_air_restore # true if we can restore in mid air |