zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

DataFlash: use #define instead of constant 90 for data length

master
Peter Barker 7 years ago committed by Francisco Ferreira
parent
fba185cefb
commit
beb2147191
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libraries/DataFlash/DataFlash_MAVLinkLogTransfer.cpp

10
libraries/DataFlash/DataFlash_MAVLinkLogTransfer.cpp
Unescape View File

@ -272,16 +272,16 @@ bool DataFlash_Class::handle_log_send_data()
uint32_t len = _log_data_remaining; uint32_t len = _log_data_remaining;
mavlink_log_data_t packet; mavlink_log_data_t packet;
if (len > 90) { if (len > MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN) {
len = 90; len = MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN;
} }
ret = get_log_data(_log_num_data, _log_data_page, _log_data_offset, len, packet.data); ret = get_log_data(_log_num_data, _log_data_page, _log_data_offset, len, packet.data);
if (ret < 0) { if (ret < 0) {
// report as EOF on error // report as EOF on error
ret = 0; ret = 0;
} }
if (ret < 90) { if (ret < MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN) {
memset(&packet.data[ret], 0, 90-ret); memset(&packet.data[ret], 0, MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN-ret);
} }
packet.ofs = _log_data_offset; packet.ofs = _log_data_offset;
@ -296,7 +296,7 @@ bool DataFlash_Class::handle_log_send_data()
_log_data_offset += len; _log_data_offset += len;
_log_data_remaining -= len; _log_data_remaining -= len;
if (ret < 90 || _log_data_remaining == 0) { if (ret < MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN || _log_data_remaining == 0) {
_log_sending = false; _log_sending = false;
_log_sending_link = nullptr; _log_sending_link = nullptr;
} }

Write Preview
Loading…
Cancel
Save