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

AP_Logger: fixed log creation on forced arm 

when we force arm we need to ask the IO thread to create the log, not
create it ourselves
This commit is contained in:
Andrew Tridgell 2021-07-01 13:40:16 +10:00 committed by Randy Mackay
parent 080ebe9cb2
commit a757706797
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -134,14 +134,19 @@ void AP_Logger_File::periodic_1Hz()
}
if (_initialised &&
!start_new_log_pending &&
_write_fd == -1 && _read_fd == -1 &&
logging_enabled() &&
!recent_open_error() &&
!hal.util->get_soft_armed()) {
!recent_open_error()) {
// retry logging open. This allows for booting with
// LOG_DISARMED=1 with a bad microSD or no microSD. Once a
// card is inserted then logging starts
start_new_log();
// this also allows for logging to start after forced arming
if (!hal.util->get_soft_armed()) {
start_new_log();
} else {
start_new_log_pending = true;
}
}
if (!io_thread_alive()) {