From 908dfa58f325a0de836f1e5140782fb6621fad9e Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 13 Apr 2020 12:26:12 +1000 Subject: [PATCH] AP_Logger: remove unused FORMATS stage in DFLogStart messagewriter --- libraries/AP_Logger/LoggerMessageWriter.cpp | 6 +----- libraries/AP_Logger/LoggerMessageWriter.h | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/AP_Logger/LoggerMessageWriter.cpp b/libraries/AP_Logger/LoggerMessageWriter.cpp index ee3b7fd3b5..7f4065f846 100644 --- a/libraries/AP_Logger/LoggerMessageWriter.cpp +++ b/libraries/AP_Logger/LoggerMessageWriter.cpp @@ -174,7 +174,7 @@ bool LoggerMessageWriter_DFLogStart::writeallrallypoints() void LoggerMessageWriter_WriteSysInfo::reset() { LoggerMessageWriter::reset(); - stage = Stage::FORMATS; + stage = Stage::FIRMWARE_STRING; } void LoggerMessageWriter_WriteSysInfo::process() { @@ -182,10 +182,6 @@ void LoggerMessageWriter_WriteSysInfo::process() { switch(stage) { - case Stage::FORMATS: - stage = Stage::FIRMWARE_STRING; - FALLTHROUGH; - case Stage::FIRMWARE_STRING: if (! _logger_backend->Write_Message(fwver.fw_string)) { return; // call me again diff --git a/libraries/AP_Logger/LoggerMessageWriter.h b/libraries/AP_Logger/LoggerMessageWriter.h index 799cb9dcfa..d56735e583 100644 --- a/libraries/AP_Logger/LoggerMessageWriter.h +++ b/libraries/AP_Logger/LoggerMessageWriter.h @@ -27,8 +27,7 @@ public: private: enum class Stage : uint8_t { - FORMATS = 0, - FIRMWARE_STRING, + FIRMWARE_STRING = 0, GIT_VERSIONS, SYSTEM_ID, PARAM_SPACE_USED,