diff --git a/libraries/DataFlash/DataFlash_Backend.h b/libraries/DataFlash/DataFlash_Backend.h index ea10ee4ed34..560e41f20ce 100644 --- a/libraries/DataFlash/DataFlash_Backend.h +++ b/libraries/DataFlash/DataFlash_Backend.h @@ -51,7 +51,7 @@ public: virtual void ShowDeviceInfo(AP_HAL::BetterStream *port) = 0; virtual void ListAvailableLogs(AP_HAL::BetterStream *port) = 0; - virtual bool logging_started(void) const { return log_write_started; } + virtual bool logging_started(void) const = 0; virtual void Init() { } @@ -62,7 +62,6 @@ public: virtual void PrepForArming() { } virtual uint16_t start_new_log(void) = 0; - bool log_write_started; /* stop logging - close output files etc etc. * diff --git a/libraries/DataFlash/DataFlash_File.cpp b/libraries/DataFlash/DataFlash_File.cpp index cbdc6933d23..77ed5aa643c 100644 --- a/libraries/DataFlash/DataFlash_File.cpp +++ b/libraries/DataFlash/DataFlash_File.cpp @@ -830,7 +830,6 @@ void DataFlash_File::stop_logging(void) if (_write_fd != -1) { int fd = _write_fd; _write_fd = -1; - log_write_started = false; ::close(fd); } } @@ -899,7 +898,6 @@ uint16_t DataFlash_File::start_new_log(void) free(fname); _write_offset = 0; _writebuf.clear(); - log_write_started = true; // now update lastlog.txt with the new log number fname = _lastlog_file_name(); diff --git a/libraries/DataFlash/DataFlash_File.h b/libraries/DataFlash/DataFlash_File.h index e8f24f25ef6..83a39daaa2a 100644 --- a/libraries/DataFlash/DataFlash_File.h +++ b/libraries/DataFlash/DataFlash_File.h @@ -71,6 +71,8 @@ public: bool logging_enabled() const override; bool logging_failed() const override; + bool logging_started(void) const override { return _write_fd != -1; } + void vehicle_was_disarmed() override; virtual void PrepForArming() override;