From 20ce017686719859b45682886b4f275ac84e5ad5 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 13 Jun 2020 15:46:49 +0200 Subject: [PATCH] fixed order of debug & trace according to spec --- lib/uuid-log/src/format_level_char.cpp | 2 +- lib/uuid-log/src/format_level_lowercase.cpp | 2 +- lib/uuid-log/src/format_level_uppercase.cpp | 2 +- lib/uuid-log/src/levels.cpp | 2 +- lib/uuid-log/src/levels_lowercase.cpp | 2 +- lib/uuid-log/src/levels_uppercase.cpp | 2 +- lib/uuid-log/src/uuid/log.h | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/uuid-log/src/format_level_char.cpp b/lib/uuid-log/src/format_level_char.cpp index 39f7848ea..264e88083 100644 --- a/lib/uuid-log/src/format_level_char.cpp +++ b/lib/uuid-log/src/format_level_char.cpp @@ -23,7 +23,7 @@ namespace uuid { namespace log { char format_level_char(Level level) { - constexpr char log_level_chars[(int)Level::ALL - (int)Level::OFF + 1] = {' ', 'P', 'A', 'C', 'E', 'W', 'N', 'I', 'T', 'D', ' '}; // changed by proddy + constexpr char log_level_chars[(int)Level::ALL - (int)Level::OFF + 1] = {' ', 'P', 'A', 'C', 'E', 'W', 'N', 'I', 'D', 'T', ' '}; return log_level_chars[(int)level + 1]; } diff --git a/lib/uuid-log/src/format_level_lowercase.cpp b/lib/uuid-log/src/format_level_lowercase.cpp index 4cd603590..61dc124fb 100644 --- a/lib/uuid-log/src/format_level_lowercase.cpp +++ b/lib/uuid-log/src/format_level_lowercase.cpp @@ -47,8 +47,8 @@ PROGMEM = {reinterpret_cast(pstr_level_lowercase_of reinterpret_cast(pstr_level_lowercase_warning), reinterpret_cast(pstr_level_lowercase_notice), reinterpret_cast(pstr_level_lowercase_info), - reinterpret_cast(pstr_level_lowercase_trace), // switched by proddy reinterpret_cast(pstr_level_lowercase_debug), + reinterpret_cast(pstr_level_lowercase_trace), reinterpret_cast(pstr_level_lowercase_all)}; const __FlashStringHelper * format_level_lowercase(Level level) { diff --git a/lib/uuid-log/src/format_level_uppercase.cpp b/lib/uuid-log/src/format_level_uppercase.cpp index 9379b378a..480e2e7a8 100644 --- a/lib/uuid-log/src/format_level_uppercase.cpp +++ b/lib/uuid-log/src/format_level_uppercase.cpp @@ -47,8 +47,8 @@ PROGMEM = {reinterpret_cast(pstr_level_uppercase_of reinterpret_cast(pstr_level_uppercase_warning), reinterpret_cast(pstr_level_uppercase_notice), reinterpret_cast(pstr_level_uppercase_info), - reinterpret_cast(pstr_level_uppercase_trace), // switched by proddy reinterpret_cast(pstr_level_uppercase_debug), + reinterpret_cast(pstr_level_uppercase_trace), reinterpret_cast(pstr_level_uppercase_all)}; const __FlashStringHelper * format_level_uppercase(Level level) { diff --git a/lib/uuid-log/src/levels.cpp b/lib/uuid-log/src/levels.cpp index e5bd51281..232067785 100644 --- a/lib/uuid-log/src/levels.cpp +++ b/lib/uuid-log/src/levels.cpp @@ -33,8 +33,8 @@ std::vector levels() { Level::WARNING, Level::NOTICE, Level::INFO, + Level::DEBUG, Level::TRACE, - Level::DEBUG, // switched by proddy Level::ALL}; } diff --git a/lib/uuid-log/src/levels_lowercase.cpp b/lib/uuid-log/src/levels_lowercase.cpp index c54512db7..30b3a4c29 100644 --- a/lib/uuid-log/src/levels_lowercase.cpp +++ b/lib/uuid-log/src/levels_lowercase.cpp @@ -35,8 +35,8 @@ std::vector levels_lowercase() { uuid::read_flash_string(format_level_lowercase(Level::WARNING)), uuid::read_flash_string(format_level_lowercase(Level::NOTICE)), uuid::read_flash_string(format_level_lowercase(Level::INFO)), - uuid::read_flash_string(format_level_lowercase(Level::TRACE)), // switched by proddy uuid::read_flash_string(format_level_lowercase(Level::DEBUG)), + uuid::read_flash_string(format_level_lowercase(Level::TRACE)), uuid::read_flash_string(format_level_lowercase(Level::ALL))}; } diff --git a/lib/uuid-log/src/levels_uppercase.cpp b/lib/uuid-log/src/levels_uppercase.cpp index 9f86f1476..b7d546603 100644 --- a/lib/uuid-log/src/levels_uppercase.cpp +++ b/lib/uuid-log/src/levels_uppercase.cpp @@ -35,8 +35,8 @@ std::vector levels_uppercase() { uuid::read_flash_string(format_level_uppercase(Level::WARNING)), uuid::read_flash_string(format_level_uppercase(Level::NOTICE)), uuid::read_flash_string(format_level_uppercase(Level::INFO)), - uuid::read_flash_string(format_level_uppercase(Level::TRACE)), // switched by proddy uuid::read_flash_string(format_level_uppercase(Level::DEBUG)), + uuid::read_flash_string(format_level_uppercase(Level::TRACE)), uuid::read_flash_string(format_level_uppercase(Level::ALL))}; } diff --git a/lib/uuid-log/src/uuid/log.h b/lib/uuid-log/src/uuid/log.h index 48ee3f727..8fa64f31d 100644 --- a/lib/uuid-log/src/uuid/log.h +++ b/lib/uuid-log/src/uuid/log.h @@ -71,7 +71,7 @@ namespace uuid { namespace log { /** - * Severity level of log messages. Proddy switches trace & debug + * Severity level of log messages. * * @since 1.0.0 */ @@ -84,8 +84,8 @@ enum Level : int8_t { WARNING, /*!< Warning conditions. @since 1.0.0 */ NOTICE, /*!< Normal but significant conditions. @since 1.0.0 */ INFO, /*!< Informational messages. @since 1.0.0 */ - TRACE, /*!< Trace messages. @since 1.0.0 */ DEBUG, /*!< Debug-level messages. @since 1.0.0 */ + TRACE, /*!< Trace messages. @since 1.0.0 */ ALL, /*!< Meta level representing all log messages. @since 1.0.0 */ };