diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 14:57:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-23 14:57:19 +0200 |
| commit | 11fa104a2aa12e266eb7dec150f08075ebfc4960 (patch) | |
| tree | 5e133b7868c96d7a033ed162fdb98b0230c931f1 /src/modules/mavlink | |
| parent | 194aa491107ca10a65065edef3977c20c02a507c (diff) | |
| parent | 68442e31ac6970be91592282c9b70ebc76fa142d (diff) | |
| download | px4-firmware-11fa104a2aa12e266eb7dec150f08075ebfc4960.tar.gz px4-firmware-11fa104a2aa12e266eb7dec150f08075ebfc4960.tar.bz2 px4-firmware-11fa104a2aa12e266eb7dec150f08075ebfc4960.zip | |
Merge branch 'master' into navigator_rewrite_estimator
Diffstat (limited to 'src/modules/mavlink')
| -rw-r--r-- | src/modules/mavlink/mavlink_messages.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 0aa4e005a..74089f780 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -1392,6 +1392,7 @@ protected: // New message mavlink_msg_rc_channels_send(_channel, rc.timestamp_publication / 1000, + rc.channel_count, ((rc.channel_count > 0) ? rc.values[0] : UINT16_MAX), ((rc.channel_count > 1) ? rc.values[1] : UINT16_MAX), ((rc.channel_count > 2) ? rc.values[2] : UINT16_MAX), @@ -1410,7 +1411,6 @@ protected: ((rc.channel_count > 15) ? rc.values[15] : UINT16_MAX), ((rc.channel_count > 16) ? rc.values[16] : UINT16_MAX), ((rc.channel_count > 17) ? rc.values[17] : UINT16_MAX), - rc.channel_count, rc.rssi); } } |