From bf5817e108825a90720ff2eb336d3c794d8d3070 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 15 Aug 2022 09:08:16 +1000 Subject: [PATCH] AP_Logger: rename HAL_MISSION_ENABLED to AP_MISSION_ENABLED --- libraries/AP_Logger/LogFile.cpp | 2 +- libraries/AP_Logger/LoggerMessageWriter.cpp | 6 +++--- libraries/AP_Logger/LoggerMessageWriter.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/AP_Logger/LogFile.cpp b/libraries/AP_Logger/LogFile.cpp index 41a370588d..192c93782f 100644 --- a/libraries/AP_Logger/LogFile.cpp +++ b/libraries/AP_Logger/LogFile.cpp @@ -315,7 +315,7 @@ bool AP_Logger_Backend::Write_Mission_Cmd(const AP_Mission &mission, return WriteBlock(&pkt, sizeof(pkt)); } -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED bool AP_Logger_Backend::Write_EntireMission() { // kick off asynchronous write: diff --git a/libraries/AP_Logger/LoggerMessageWriter.cpp b/libraries/AP_Logger/LoggerMessageWriter.cpp index 429062489b..c41799496e 100644 --- a/libraries/AP_Logger/LoggerMessageWriter.cpp +++ b/libraries/AP_Logger/LoggerMessageWriter.cpp @@ -38,7 +38,7 @@ void LoggerMessageWriter_DFLogStart::reset() _fmt_done = false; _params_done = false; _writesysinfo.reset(); -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED _writeentiremission.reset(); #endif #if HAL_RALLY_ENABLED @@ -136,7 +136,7 @@ void LoggerMessageWriter_DFLogStart::process() return; } } -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED if (!_writeentiremission.finished()) { _writeentiremission.process(); if (!_writeentiremission.finished()) { @@ -175,7 +175,7 @@ void LoggerMessageWriter_DFLogStart::process() _finished = true; } -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED bool LoggerMessageWriter_DFLogStart::writeentiremission() { if (stage != Stage::DONE) { diff --git a/libraries/AP_Logger/LoggerMessageWriter.h b/libraries/AP_Logger/LoggerMessageWriter.h index f052f0cce4..535e5cd34d 100644 --- a/libraries/AP_Logger/LoggerMessageWriter.h +++ b/libraries/AP_Logger/LoggerMessageWriter.h @@ -78,7 +78,7 @@ class LoggerMessageWriter_DFLogStart : public LoggerMessageWriter { public: LoggerMessageWriter_DFLogStart() : _writesysinfo() -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED , _writeentiremission() #endif #if HAL_RALLY_ENABLED @@ -90,7 +90,7 @@ public: virtual void set_logger_backend(class AP_Logger_Backend *backend) override { LoggerMessageWriter::set_logger_backend(backend); _writesysinfo.set_logger_backend(backend); -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED _writeentiremission.set_logger_backend(backend); #endif #if HAL_RALLY_ENABLED @@ -107,7 +107,7 @@ public: // reset some writers so we push stuff out to logs again. Will // only work if we are in state DONE! -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED bool writeentiremission(); #endif #if HAL_RALLY_ENABLED @@ -145,7 +145,7 @@ private: LoggerMessageWriter_WriteSysInfo _writesysinfo; -#if HAL_MISSION_ENABLED +#if AP_MISSION_ENABLED LoggerMessageWriter_WriteEntireMission _writeentiremission; #endif #if HAL_RALLY_ENABLED