Browse Source

MAVLink app: More debug string formatting

sbg
Lorenz Meier 8 years ago
parent
commit
d15dd061f9
  1. 11
      src/modules/mavlink/mavlink_command_sender.cpp

11
src/modules/mavlink/mavlink_command_sender.cpp

@ -125,7 +125,8 @@ void MavlinkCommandSender::handle_mavlink_command_ack(const mavlink_command_ack_ @@ -125,7 +125,8 @@ void MavlinkCommandSender::handle_mavlink_command_ack(const mavlink_command_ack_
uint8_t from_sysid, uint8_t from_compid)
{
CMD_DEBUG("handling result %d for command %d: %d from %d",
ack.result, ack.command, from_sysid, from_compid);
static_cast<unsigned int>(ack.result), static_cast<unsigned int>(ack.command),
static_cast<unsigned int>(from_sysid), static_cast<unsigned int>(from_compid));
lock();
_commands.reset_to_start();
@ -187,7 +188,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel) @@ -187,7 +188,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
item->num_sent_per_channel[channel]++;
CMD_DEBUG("%x timeout (behind), retries: %d/%d, channel: %d",
item, item->num_sent_per_channel[channel], max_sent, channel);
static_cast<unsigned int>(item), item->num_sent_per_channel[channel],
max_sent, channel);
} else if (item->num_sent_per_channel[channel] == max_sent &&
min_sent == max_sent) {
@ -196,7 +198,7 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel) @@ -196,7 +198,7 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
// drop the item, and continue with other items.
if (item->num_sent_per_channel[channel] + 1 > RETRIES) {
_commands.drop_current();
CMD_DEBUG("%x, timeout dropped", item);
CMD_DEBUG("%x, timeout dropped", static_cast<unsigned int>(item));
continue;
}
@ -207,7 +209,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel) @@ -207,7 +209,8 @@ void MavlinkCommandSender::check_timeout(mavlink_channel_t channel)
item->last_time_sent_us = hrt_absolute_time();
CMD_DEBUG("%x timeout (first), retries: %d/%d, channel: %d",
item, item->num_sent_per_channel[channel], max_sent, channel);
static_cast<unsigned int>(item), item->num_sent_per_channel[channel],
max_sent, channel);
} else {
// We are already ahead, so this should not happen.

Loading…
Cancel
Save