Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-10-15 14:53:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: leave room in buffer for non-startup messages

Browse Source
This commit is contained in:
Peter Barker
2015-09-18 09:13:45 +10:00
committed by Andrew Tridgell
parent 63a45000b4
commit 8f1471c137
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/DataFlash/DataFlash_File.cpp
+16 -4
View File
@@ -354,10 +354,22 @@ bool DataFlash_File::WritePrioritisedBlock(const void *pBuffer, uint16_t size, b
uint16_t _head;
uint16_t space = BUF_SPACE(_writebuf);
// we reserve some amount of space for critical messages:
if (!is_critical && space < critical_message_reserved_space()) {
_dropped++;
return false;
if (_writing_startup_messages &&
_front._startup_messagewriter.fmt_done()) {
// the state machine has called us, and it has finished
// writing format messages out. It can always get back to us
// with more messages later, so let's leave room for other
// things:
if (space < non_messagewriter_message_reserved_space()) {
// this message isn't dropped, it will be sent again...
return false;
}
} else {
// we reserve some amount of space for critical messages:
if (!is_critical && space < critical_message_reserved_space()) {
_dropped++;
return false;
}
}
// if no room for entire message - drop it: