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

AP_Logger: check is_system_initialized() when determining liveness

This commit is contained in:
Andy Piper 2020-12-18 20:39:42 +00:00 committed by Andrew Tridgell
parent c8e464ebea
commit 048deeb43e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Logger/AP_Logger_Block.cpp
View File

@ -827,7 +827,7 @@ bool AP_Logger_Block::logging_failed() const
bool AP_Logger_Block::io_thread_alive() const
{
// if the io thread hasn't had a heartbeat in 3s it is dead
return (AP_HAL::millis() - io_timer_heartbeat) < 3000U || hal.scheduler->in_expected_delay();
return (AP_HAL::millis() - io_timer_heartbeat) < 3000U || !hal.scheduler->is_system_initialized();
}
/*

2
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -1003,7 +1003,7 @@ bool AP_Logger_File::io_thread_alive() const
{
// if the io thread hasn't had a heartbeat in a full seconds then it is dead
// this is enough time for a sdcard remount
return (AP_HAL::millis() - _io_timer_heartbeat) < 3000U;
return (AP_HAL::millis() - _io_timer_heartbeat) < 3000U || !hal.scheduler->is_system_initialized();
}
bool AP_Logger_File::logging_failed() const