fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-06 13:01:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAVLink app: More print improvements

Browse Source
This commit is contained in:
Lorenz Meier
2017-07-08 15:23:46 +02:00
parent d15dd061f9
commit ddf32e14de
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_command_sender.cpp
+6 -9
View File
@@ -125,8 +125,7 @@ void MavlinkCommandSender::handle_mavlink_command_ack(const mavlink_command_ack_
uint8_t from_sysid, uint8_t from_compid) uint8_t from_sysid, uint8_t from_compid)
{ {
CMD_DEBUG("handling result %d for command %d: %d from %d", CMD_DEBUG("handling result %d for command %d: %d from %d",
static_cast<unsigned int>(ack.result), static_cast<unsigned int>(ack.command), ack.result, ack.command, from_sysid, from_compid);
static_cast<unsigned int>(from_sysid), static_cast<unsigned int>(from_compid));
lock(); lock();
_commands.reset_to_start(); _commands.reset_to_start();
@@ -187,9 +186,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
mavlink_msg_command_long_send_struct(channel, &item->command); mavlink_msg_command_long_send_struct(channel, &item->command);
item->num_sent_per_channel[channel]++; item->num_sent_per_channel[channel]++;
CMD_DEBUG("%x timeout (behind), retries: %d/%d, channel: %d", CMD_DEBUG("%p timeout (behind), retries: %d/%d, channel: %d",
static_cast<unsigned int>(item), item->num_sent_per_channel[channel], item, item->num_sent_per_channel[channel], max_sent, channel);
max_sent, channel);
} else if (item->num_sent_per_channel[channel] == max_sent && } else if (item->num_sent_per_channel[channel] == max_sent &&
min_sent == max_sent) { min_sent == max_sent) {
@@ -198,7 +196,7 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
// drop the item, and continue with other items. // drop the item, and continue with other items.
if (item->num_sent_per_channel[channel] + 1 > RETRIES) { if (item->num_sent_per_channel[channel] + 1 > RETRIES) {
_commands.drop_current(); _commands.drop_current();
CMD_DEBUG("%x, timeout dropped", static_cast<unsigned int>(item)); CMD_DEBUG("%p, timeout dropped", item);
continue; continue;
} }
@@ -208,9 +206,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
// Therefore, we are the ones setting the timestamp of this retry round. // Therefore, we are the ones setting the timestamp of this retry round.
item->last_time_sent_us = hrt_absolute_time(); item->last_time_sent_us = hrt_absolute_time();
CMD_DEBUG("%x timeout (first), retries: %d/%d, channel: %d", CMD_DEBUG("%p timeout (first), retries: %d/%d, channel: %d",
static_cast<unsigned int>(item), item->num_sent_per_channel[channel], item, item->num_sent_per_channel[channel], max_sent, channel);
max_sent, channel);
} else { } else {
// We are already ahead, so this should not happen. // We are already ahead, so this should not happen.