feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

feat(log): Move LOG_FORMAT macros out of esp_log.h

Browse Source
This commit is contained in:
Konstantin Kondrashov
2024-05-17 22:52:19 +03:00
committed by BOT
parent fa3b26bbc3
commit 9f2b892512
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/log/include/esp_log.h
View File

@@ -16,18 +16,12 @@
#include "esp_log_buffer.h" #include "esp_log_buffer.h"
#include "esp_log_timestamp.h" #include "esp_log_timestamp.h"
#include "esp_log_write.h" #include "esp_log_write.h"
#include "esp_log_format.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** @cond */
#define LOG_FORMAT(letter, format) LOG_COLOR_ ## letter #letter " (%" PRIu32 ") %s: " format LOG_RESET_COLOR "\n"
#define LOG_SYSTEM_TIME_FORMAT(letter, format) LOG_COLOR_ ## letter #letter " (%s) %s: " format LOG_RESET_COLOR "\n"
/** @endcond */
/// macro to output logs in startup code, before heap allocator and syscalls have been initialized. /// macro to output logs in startup code, before heap allocator and syscalls have been initialized.
/// Log at ``ESP_LOG_ERROR`` level. @see ``printf``,``ESP_LOGE``,``ESP_DRAM_LOGE`` /// Log at ``ESP_LOG_ERROR`` level. @see ``printf``,``ESP_LOGE``,``ESP_DRAM_LOGE``
@@ -208,7 +202,6 @@ extern "C" {
#endif // !(defined(__cplusplus) && (__cplusplus > 201703L)) #endif // !(defined(__cplusplus) && (__cplusplus > 201703L))
/** @cond */ /** @cond */
#define _ESP_LOG_DRAM_LOG_FORMAT(letter, format) DRAM_STR(#letter " %s: " format "\n")
#if defined(__cplusplus) && (__cplusplus > 201703L) #if defined(__cplusplus) && (__cplusplus > 201703L)
#define ESP_DRAM_LOG_IMPL(tag, format, log_level, log_tag_letter, ...) do { \ #define ESP_DRAM_LOG_IMPL(tag, format, log_level, log_tag_letter, ...) do { \

22
components/log/include/esp_log_format.h Normal file
View File

@@ -0,0 +1,22 @@
/*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
/** @cond */
// For backward compatibility (these macros are not used in the log v2).
#define LOG_FORMAT(letter, format) LOG_COLOR_ ## letter #letter " (%" PRIu32 ") %s: " format LOG_RESET_COLOR "\n"
#define _ESP_LOG_DRAM_LOG_FORMAT(letter, format) DRAM_STR(#letter " %s: " format "\n")
#define LOG_SYSTEM_TIME_FORMAT(letter, format) LOG_COLOR_ ## letter #letter " (%s) %s: " format LOG_RESET_COLOR "\n"
/** @endcond */
#ifdef __cplusplus
}
#endif