diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-31 09:51:59 +0100 |
commit | d2b183c05bba5443d24e8df8b6fc5f52bd27275d (patch) | |
tree | 99b1ee91cbb108a35ce00c8cc632f635c6022f03 /src/modules/mavlink/orb_listener.c | |
parent | fb446c01b815b00f5da098d340557164fdbf78c9 (diff) | |
parent | 83df116c7aa21b6d68f2aa31c4526dd822495d70 (diff) | |
download | px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.gz px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.tar.bz2 px4-firmware-d2b183c05bba5443d24e8df8b6fc5f52bd27275d.zip |
merge master
Diffstat (limited to 'src/modules/mavlink/orb_listener.c')
-rw-r--r-- | src/modules/mavlink/orb_listener.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mavlink/orb_listener.c b/src/modules/mavlink/orb_listener.c index 4a4ebf709..d3b735cfe 100644 --- a/src/modules/mavlink/orb_listener.c +++ b/src/modules/mavlink/orb_listener.c @@ -352,10 +352,10 @@ l_input_rc(const struct listener *l) const unsigned port_width = 8; - for (unsigned i = 0; (i * port_width) < (rc_raw.channel_count + port_width); i++) { + for (unsigned i = 0; (i * port_width) < rc_raw.channel_count; i++) { /* Channels are sent in MAVLink main loop at a fixed interval */ mavlink_msg_rc_channels_raw_send(chan, - rc_raw.timestamp / 1000, + rc_raw.timestamp_publication / 1000, i, (rc_raw.channel_count > (i * port_width) + 0) ? rc_raw.values[(i * port_width) + 0] : UINT16_MAX, (rc_raw.channel_count > (i * port_width) + 1) ? rc_raw.values[(i * port_width) + 1] : UINT16_MAX, |