Browse Source

AP_Logger: rename HAL_MISSION_ENABLED to AP_MISSION_ENABLED

master
Peter Barker 3 years ago committed by Peter Barker
parent
commit
bf5817e108
  1. 2
      libraries/AP_Logger/LogFile.cpp
  2. 6
      libraries/AP_Logger/LoggerMessageWriter.cpp
  3. 8
      libraries/AP_Logger/LoggerMessageWriter.h

2
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)); return WriteBlock(&pkt, sizeof(pkt));
} }
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
bool AP_Logger_Backend::Write_EntireMission() bool AP_Logger_Backend::Write_EntireMission()
{ {
// kick off asynchronous write: // kick off asynchronous write:

6
libraries/AP_Logger/LoggerMessageWriter.cpp

@ -38,7 +38,7 @@ void LoggerMessageWriter_DFLogStart::reset()
_fmt_done = false; _fmt_done = false;
_params_done = false; _params_done = false;
_writesysinfo.reset(); _writesysinfo.reset();
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
_writeentiremission.reset(); _writeentiremission.reset();
#endif #endif
#if HAL_RALLY_ENABLED #if HAL_RALLY_ENABLED
@ -136,7 +136,7 @@ void LoggerMessageWriter_DFLogStart::process()
return; return;
} }
} }
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
if (!_writeentiremission.finished()) { if (!_writeentiremission.finished()) {
_writeentiremission.process(); _writeentiremission.process();
if (!_writeentiremission.finished()) { if (!_writeentiremission.finished()) {
@ -175,7 +175,7 @@ void LoggerMessageWriter_DFLogStart::process()
_finished = true; _finished = true;
} }
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
bool LoggerMessageWriter_DFLogStart::writeentiremission() bool LoggerMessageWriter_DFLogStart::writeentiremission()
{ {
if (stage != Stage::DONE) { if (stage != Stage::DONE) {

8
libraries/AP_Logger/LoggerMessageWriter.h

@ -78,7 +78,7 @@ class LoggerMessageWriter_DFLogStart : public LoggerMessageWriter {
public: public:
LoggerMessageWriter_DFLogStart() : LoggerMessageWriter_DFLogStart() :
_writesysinfo() _writesysinfo()
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
, _writeentiremission() , _writeentiremission()
#endif #endif
#if HAL_RALLY_ENABLED #if HAL_RALLY_ENABLED
@ -90,7 +90,7 @@ public:
virtual void set_logger_backend(class AP_Logger_Backend *backend) override { virtual void set_logger_backend(class AP_Logger_Backend *backend) override {
LoggerMessageWriter::set_logger_backend(backend); LoggerMessageWriter::set_logger_backend(backend);
_writesysinfo.set_logger_backend(backend); _writesysinfo.set_logger_backend(backend);
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
_writeentiremission.set_logger_backend(backend); _writeentiremission.set_logger_backend(backend);
#endif #endif
#if HAL_RALLY_ENABLED #if HAL_RALLY_ENABLED
@ -107,7 +107,7 @@ public:
// reset some writers so we push stuff out to logs again. Will // reset some writers so we push stuff out to logs again. Will
// only work if we are in state DONE! // only work if we are in state DONE!
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
bool writeentiremission(); bool writeentiremission();
#endif #endif
#if HAL_RALLY_ENABLED #if HAL_RALLY_ENABLED
@ -145,7 +145,7 @@ private:
LoggerMessageWriter_WriteSysInfo _writesysinfo; LoggerMessageWriter_WriteSysInfo _writesysinfo;
#if HAL_MISSION_ENABLED #if AP_MISSION_ENABLED
LoggerMessageWriter_WriteEntireMission _writeentiremission; LoggerMessageWriter_WriteEntireMission _writeentiremission;
#endif #endif
#if HAL_RALLY_ENABLED #if HAL_RALLY_ENABLED

Loading…
Cancel
Save