From 38bc9bfab17ba52d15133903963865e0b2ac2c82 Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Sat, 15 Oct 2022 19:39:27 +0100 Subject: [PATCH] AP_Logger: on example sketches there is always time to write out FMT messages --- libraries/AP_Logger/AP_Logger_File.cpp | 2 +- libraries/AP_Logger/LoggerMessageWriter.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Logger/AP_Logger_File.cpp b/libraries/AP_Logger/AP_Logger_File.cpp index 21d0538ee1..7ee5c18ee5 100644 --- a/libraries/AP_Logger/AP_Logger_File.cpp +++ b/libraries/AP_Logger/AP_Logger_File.cpp @@ -874,7 +874,7 @@ void AP_Logger_File::start_new_log(void) #if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX void AP_Logger_File::flush(void) -#if APM_BUILD_TYPE(APM_BUILD_Replay) || APM_BUILD_TYPE(APM_BUILD_UNKNOWN) +#if APM_BUILD_TYPE(APM_BUILD_Replay) { uint32_t tnow = AP_HAL::millis(); while (_write_fd != -1 && _initialised && !recent_open_error() && _writebuf.available()) { diff --git a/libraries/AP_Logger/LoggerMessageWriter.cpp b/libraries/AP_Logger/LoggerMessageWriter.cpp index 752a45047e..6ba0a0831d 100644 --- a/libraries/AP_Logger/LoggerMessageWriter.cpp +++ b/libraries/AP_Logger/LoggerMessageWriter.cpp @@ -25,7 +25,7 @@ void LoggerMessageWriter::reset() bool LoggerMessageWriter::out_of_time_for_writing_messages() const { -#if HAL_SCHEDULER_ENABLED +#if HAL_SCHEDULER_ENABLED && !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) return AP::scheduler().time_available_usec() < MIN_LOOP_TIME_REMAINING_FOR_MESSAGE_WRITE_US; #else return false; @@ -62,7 +62,7 @@ bool LoggerMessageWriter_DFLogStart::out_of_time_for_writing_messages() const { if (stage == Stage::FORMATS) { // write out the FMT messages as fast as we can -#if HAL_SCHEDULER_ENABLED +#if HAL_SCHEDULER_ENABLED && !APM_BUILD_TYPE(APM_BUILD_UNKNOWN) return AP::scheduler().time_available_usec() == 0; #else return false;