aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCS_MAVLink: check target before erasing log

Browse Source
This commit is contained in:
Randy Mackay 2014-09-27 11:43:14 +09:00 committed by Andrew Tridgell
parent 77e89214eb
commit 0322a876eb
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/GCS_MAVLink/GCS.h
View File

@ -319,6 +319,8 @@ private:
void handle_log_request_list(mavlink_message_t *msg, DataFlash_Class &dataflash);
void handle_log_request_data(mavlink_message_t *msg, DataFlash_Class &dataflash);
void handle_log_request_erase(mavlink_message_t *msg, DataFlash_Class &dataflash);
void handle_log_request_end(mavlink_message_t *msg, DataFlash_Class &dataflash);
void handle_log_message(mavlink_message_t *msg, DataFlash_Class &dataflash);
void handle_log_send(DataFlash_Class &dataflash);
void handle_log_send_listing(DataFlash_Class &dataflash);

30
libraries/GCS_MAVLink/GCS_Logs.cpp
View File

@ -38,13 +38,12 @@ void GCS_MAVLINK::handle_log_message(mavlink_message_t *msg, DataFlash_Class &da
handle_log_request_data(msg, dataflash);
break;
case MAVLINK_MSG_ID_LOG_ERASE:
dataflash.EraseAll();
handle_log_request_erase(msg, dataflash);
break;
case MAVLINK_MSG_ID_LOG_REQUEST_END:
_log_sending = false;
handle_log_request_end(msg, dataflash);
break;
}
}
@ -126,6 +125,31 @@ void GCS_MAVLINK::handle_log_request_data(mavlink_message_t *msg, DataFlash_Clas
handle_log_send(dataflash);
}
/**
handle request to erase log data
*/
void GCS_MAVLINK::handle_log_request_erase(mavlink_message_t *msg, DataFlash_Class &dataflash)
{
mavlink_log_request_data_t packet;
mavlink_msg_log_request_data_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
return;
dataflash.EraseAll();
}
/**
handle request to stop transfer and resume normal logging
*/
void GCS_MAVLINK::handle_log_request_end(mavlink_message_t *msg, DataFlash_Class &dataflash)
{
mavlink_log_request_data_t packet;
mavlink_msg_log_request_data_decode(msg, &packet);
if (mavlink_check_target(packet.target_system, packet.target_component))
return;
_log_sending = false;
}
/**
trigger sending of log messages if there are some pending
*/