diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:54:43 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-08 13:54:43 +0200 |
| commit | 0b4ff28037e244ce3a6edff20d043c3c7df3345d (patch) | |
| tree | 89b6f1af9eb8d78d4ad41cdce522e69ac84bf039 /src/modules/mavlink/mavlink_ftp.h | |
| parent | e380aa3f62c9db89f048f3683e3611e455de4ad2 (diff) | |
| parent | 43b66c724aaa062814ed7b9342456562a23d7f03 (diff) | |
| download | px4-firmware-0b4ff28037e244ce3a6edff20d043c3c7df3345d.tar.gz px4-firmware-0b4ff28037e244ce3a6edff20d043c3c7df3345d.tar.bz2 px4-firmware-0b4ff28037e244ce3a6edff20d043c3c7df3345d.zip | |
Merge branch 'master' of github.com:PX4/Firmware into warning_fixes_v5
Diffstat (limited to 'src/modules/mavlink/mavlink_ftp.h')
| -rw-r--r-- | src/modules/mavlink/mavlink_ftp.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/modules/mavlink/mavlink_ftp.h b/src/modules/mavlink/mavlink_ftp.h index e22e61553..59237a4c4 100644 --- a/src/modules/mavlink/mavlink_ftp.h +++ b/src/modules/mavlink/mavlink_ftp.h @@ -147,20 +147,21 @@ private: unsigned len = mavlink_msg_encapsulated_data_pack_chan(_mavlink->get_system_id(), _mavlink->get_component_id(), _mavlink->get_channel(), &msg, sequence(), rawData()); - _mavlink->lockMessageBufferMutex(); - bool fError = _mavlink->message_buffer_write(&msg, len); - _mavlink->unlockMessageBufferMutex(); - - if (!fError) { + _mavlink->lockMessageBufferMutex(); + bool success = _mavlink->message_buffer_write(&msg, len); + _mavlink->unlockMessageBufferMutex(); + + if (!success) { warnx("FTP TX ERR"); - } else { - warnx("wrote: sys: %d, comp: %d, chan: %d, len: %d, checksum: %d", - _mavlink->get_system_id(), - _mavlink->get_component_id(), - _mavlink->get_channel(), - len, - msg.checksum); - } + } + // else { + // warnx("wrote: sys: %d, comp: %d, chan: %d, len: %d, checksum: %d", + // _mavlink->get_system_id(), + // _mavlink->get_component_id(), + // _mavlink->get_channel(), + // len, + // msg.checksum); + // } } uint8_t *rawData() { return &_message.data[0]; } |