diff --git a/src/modules/logger/log_writer.cpp b/src/modules/logger/log_writer.cpp index 88797660d2..5d4e9c5382 100644 --- a/src/modules/logger/log_writer.cpp +++ b/src/modules/logger/log_writer.cpp @@ -38,10 +38,10 @@ namespace px4 namespace logger { -LogWriter::LogWriter(Backend backend, size_t file_buffer_size, unsigned int queue_size) - : _backend(backend) +LogWriter::LogWriter(Backend configured_backend, size_t file_buffer_size, unsigned int queue_size) + : _backend(configured_backend) { - if (backend & BackendFile) { + if (configured_backend & BackendFile) { _log_writer_file_for_write = _log_writer_file = new LogWriterFile(file_buffer_size); if (!_log_writer_file) { @@ -49,7 +49,7 @@ LogWriter::LogWriter(Backend backend, size_t file_buffer_size, unsigned int queu } } - if (backend & BackendMavlink) { + if (configured_backend & BackendMavlink) { _log_writer_mavlink_for_write = _log_writer_mavlink = new LogWriterMavlink(queue_size); if (!_log_writer_mavlink) { @@ -110,13 +110,13 @@ bool LogWriter::is_started() const return ret; } -bool LogWriter::is_started(Backend backend) const +bool LogWriter::is_started(Backend query_backend) const { - if (backend == BackendFile && _log_writer_file) { + if (query_backend == BackendFile && _log_writer_file) { return _log_writer_file->is_started(); } - if (backend == BackendMavlink && _log_writer_mavlink) { + if (query_backend == BackendMavlink && _log_writer_mavlink) { return _log_writer_mavlink->is_started(); } @@ -178,16 +178,16 @@ int LogWriter::write_message(void *ptr, size_t size, uint64_t dropout_start) return ret_mavlink; } -void LogWriter::select_write_backend(Backend backend) +void LogWriter::select_write_backend(Backend sel_backend) { - if (backend & BackendFile) { + if (sel_backend & BackendFile) { _log_writer_file_for_write = _log_writer_file; } else { _log_writer_file_for_write = nullptr; } - if (backend & BackendMavlink) { + if (sel_backend & BackendMavlink) { _log_writer_mavlink_for_write = _log_writer_mavlink; } else { diff --git a/src/modules/logger/log_writer.h b/src/modules/logger/log_writer.h index b84021f5e7..efc8fb3ba0 100644 --- a/src/modules/logger/log_writer.h +++ b/src/modules/logger/log_writer.h @@ -55,7 +55,7 @@ public: static constexpr Backend BackendMavlink = 1 << 1; static constexpr Backend BackendAll = BackendFile | BackendMavlink; - LogWriter(Backend backend, size_t file_buffer_size, unsigned int queue_size); + LogWriter(Backend configured_backend, size_t file_buffer_size, unsigned int queue_size); ~LogWriter(); bool init(); @@ -81,7 +81,7 @@ public: /** * whether logging is currently active or not for a specific backend. */ - bool is_started(Backend backend) const; + bool is_started(Backend query_backend) const; /** * Write a single ulog message (including header). The caller must call lock() before calling this. @@ -93,10 +93,10 @@ public: /** * Select a backend, so that future calls to write_message() only write to the selected - * backend, until unselect_write_backend() is called. + * sel_backend, until unselect_write_backend() is called. * @param backend */ - void select_write_backend(Backend backend); + void select_write_backend(Backend sel_backend); void unselect_write_backend() { select_write_backend(BackendAll); } /* file logging methods */