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

AP_Dataflash: use millis/micros/panic functions

Browse Source
This commit is contained in:
Caio Marcelo de Oliveira Filho
2015-11-20 12:35:00 +09:00
committed by Randy Mackay
parent 0aa520a273
commit 753956bd77
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/DataFlash/DataFlash_File.cpp
+2 -2
View File
@@ -918,7 +918,7 @@ void DataFlash_File::ListAvailableLogs(AP_HAL::BetterStream *port)
void DataFlash_File::flush(void)
{
uint16_t _tail;
uint32_t tnow = hal.scheduler->micros();
uint32_t tnow = AP_HAL::micros();
hal.scheduler->suspend_timer_procs();
while (_write_fd != -1 && _initialised && !_open_error &&
BUF_AVAILABLE(_writebuf)) {
@@ -945,7 +945,7 @@ void DataFlash_File::_io_timer(void)
if (nbytes == 0) {
return;
}
uint32_t tnow = hal.scheduler->micros();
uint32_t tnow = AP_HAL::micros();
if (nbytes < _writebuf_chunk &&
tnow - _last_write_time < 2000000UL) {
// write in _writebuf_chunk-sized chunks, but always write at