diff options
| author | M.H.Kabir <mhkabir98@gmail.com> | 2014-12-16 13:50:35 +0530 |
|---|---|---|
| committer | M.H.Kabir <mhkabir98@gmail.com> | 2014-12-16 13:50:35 +0530 |
| commit | a5591b47919dbe7f61024c95d90e6333460e5b11 (patch) | |
| tree | 321b6f5ca42da5a95a151df5a61199c2d1e1eaf3 /src/modules/mavlink/mavlink_messages.cpp | |
| parent | 8c0d7047b209c23cb14b3a09bf20599af0f8cc6e (diff) | |
| parent | a2bcbabd161d629148ae3b9fcb181fddc5a8d1d1 (diff) | |
| download | px4-firmware-a5591b47919dbe7f61024c95d90e6333460e5b11.tar.gz px4-firmware-a5591b47919dbe7f61024c95d90e6333460e5b11.tar.bz2 px4-firmware-a5591b47919dbe7f61024c95d90e6333460e5b11.zip | |
Merge remote-tracking branch 'upstream/master' into timesync
Conflicts:
src/modules/mavlink/mavlink_messages.cpp
Diffstat (limited to 'src/modules/mavlink/mavlink_messages.cpp')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index dcf9aeb64..bad788ad0 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -1351,8 +1351,11 @@ protected: /* scale outputs depending on system type */ if (system_type == MAV_TYPE_QUADROTOR || - system_type == MAV_TYPE_HEXAROTOR || - system_type == MAV_TYPE_OCTOROTOR) { + system_type == MAV_TYPE_HEXAROTOR || + system_type == MAV_TYPE_OCTOROTOR || + system_type == MAV_TYPE_VTOL_DUOROTOR || + system_type == MAV_TYPE_VTOL_QUADROTOR) { + /* multirotors: set number of rotor outputs depending on type */ unsigned n; @@ -1366,6 +1369,14 @@ protected: n = 6; break; + case MAV_TYPE_VTOL_DUOROTOR: + n = 2; + break; + + case MAV_TYPE_VTOL_QUADROTOR: + n = 4; + break; + default: n = 8; break; |