Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DataFlash: clear format sent mask when backend starts new log

This commit is contained in:
Peter Barker 2017-04-28 17:37:13 +10:00 committed by Andrew Tridgell
parent 2876f1467c
commit ac1484f60e
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/DataFlash/DataFlash.cpp
View File

@ -265,6 +265,19 @@ void DataFlash_Class::Log_Write_MessageF(const char *fmt, ...)
Log_Write_Message(msg);
}
void DataFlash_Class::backend_starting_new_log(const DataFlash_Backend *backend)
{
for (uint8_t i=0; i<_next_backend; i++) {
if (backends[i] == backend) { // pointer comparison!
// reset sent masks
for (struct log_write_fmt *f = log_write_fmts; f; f=f->next) {
f->sent_mask &= ~(1<<i);
}
break;
}
}
}
#define FOR_EACH_BACKEND(methodcall) \
do { \
for (uint8_t i=0; i<_next_backend; i++) { \

4
libraries/DataFlash/DataFlash.h
View File

@ -272,7 +272,9 @@ private:
void Log_Write_EKF2(AP_AHRS_NavEKF &ahrs, bool optFlowEnabled);
void Log_Write_EKF3(AP_AHRS_NavEKF &ahrs, bool optFlowEnabled);
#endif
void backend_starting_new_log(const DataFlash_Backend *backend);
private:
static DataFlash_Class *_instance;

1
libraries/DataFlash/DataFlash_Backend.cpp
View File

@ -53,6 +53,7 @@ void DataFlash_Backend::periodic_tasks()
void DataFlash_Backend::start_new_log_reset_variables()
{
_startup_messagewriter->reset();
_front.backend_starting_new_log(this);
}
void DataFlash_Backend::internal_error() {

7
libraries/DataFlash/LogFile.cpp
View File

@ -584,15 +584,14 @@ void DataFlash_Block::ListAvailableLogs(AP_HAL::BetterStream *port)
// This function starts a new log file in the DataFlash, and writes
// the format of supported messages in the log
// This function is ONLY called from the vehicle code.
// DataFlash_MAVLink, for example, will NOT call this function if the
// remote end disconnects and reconnects!
void DataFlash_Class::StartNewLog(void)
{
for (uint8_t i=0; i<_next_backend; i++) {
backends[i]->start_new_log();
}
// reset sent masks
for (struct log_write_fmt *f = log_write_fmts; f; f=f->next) {
f->sent_mask = 0;
}
}
/*