diff --git a/components/log/include/esp_log.h b/components/log/include/esp_log.h index e525bca3c..2f251c6b8 100644 --- a/components/log/include/esp_log.h +++ b/components/log/include/esp_log.h @@ -100,8 +100,16 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, . #include "esp_log_internal.h" +#ifndef LOG_LOCAL_LEVEL +#ifndef BOOTLOADER_BUILD +#define LOG_LOCAL_LEVEL CONFIG_LOG_DEFAULT_LEVEL +#else +#define LOG_LOCAL_LEVEL CONFIG_LOG_BOOTLOADER_LEVEL +#endif +#endif + /** - * @brief Log a buffer of hex bytes at specified level, seprated into 16 bytes each line. + * @brief Log a buffer of hex bytes at specified level, separated into 16 bytes each line. * * @param tag description tag * @@ -116,7 +124,7 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, . if ( LOG_LOCAL_LEVEL >= level ) esp_log_buffer_hex_internal( tag, buffer, buff_len, level ); } while(0) /** - * @brief Log a buffer of characters at specified level, seprated into 16 bytes each line. Buffer should contain only printable characters. + * @brief Log a buffer of characters at specified level, separated into 16 bytes each line. Buffer should contain only printable characters. * * @param tag description tag * @@ -219,14 +227,6 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, . #define LOG_FORMAT(letter, format) LOG_COLOR_ ## letter #letter " (%d) %s: " format LOG_RESET_COLOR "\n" -#ifndef LOG_LOCAL_LEVEL -#ifndef BOOTLOADER_BUILD -#define LOG_LOCAL_LEVEL ((esp_log_level_t) CONFIG_LOG_DEFAULT_LEVEL) -#else -#define LOG_LOCAL_LEVEL ((esp_log_level_t) CONFIG_LOG_BOOTLOADER_LEVEL) -#endif -#endif - /// 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`` #define ESP_EARLY_LOGE( tag, format, ... ) if (LOG_LOCAL_LEVEL >= ESP_LOG_ERROR) { ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), tag, ##__VA_ARGS__); } /// macro to output logs in startup code at ``ESP_LOG_WARN`` level. @see ``ESP_EARLY_LOGE``,``ESP_LOGE``, ``printf`` @@ -263,7 +263,7 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, . #define ESP_LOGV( tag, format, ... ) ESP_EARLY_LOGV(tag, format, ##__VA_ARGS__) #endif // BOOTLOADER_BUILD -/** runtime macro to output logs at a speicfied level. +/** runtime macro to output logs at a specified level. * * @param tag tag of the log, which can be used to change the log level by ``esp_log_level_set`` at runtime. * @@ -282,7 +282,7 @@ void esp_log_write(esp_log_level_t level, const char* tag, const char* format, . else if (level==ESP_LOG_VERBOSE ) { esp_log_write(ESP_LOG_VERBOSE, tag, LOG_FORMAT(V, format), esp_log_timestamp(), tag, ##__VA_ARGS__); }\ else { esp_log_write(ESP_LOG_INFO, tag, LOG_FORMAT(I, format), esp_log_timestamp(), tag, ##__VA_ARGS__); }}while(0) -/** runtime macro to output logs at a speicfied level. Also check the level with ``LOG_LOCAL_LEVEL``. +/** runtime macro to output logs at a specified level. Also check the level with ``LOG_LOCAL_LEVEL``. * * @see ``printf``, ``ESP_LOG_LEVEL`` */ diff --git a/components/log/include/esp_log_internal.h b/components/log/include/esp_log_internal.h index a41243881..94ec34632 100644 --- a/components/log/include/esp_log_internal.h +++ b/components/log/include/esp_log_internal.h @@ -15,7 +15,7 @@ #ifndef __ESP_LOG_INTERNAL_H__ #define __ESP_LOG_INTERNAL_H__ -//these two functions do not check level versus ESP_LOCAL_LEVEL, this should be done in esp_log.h +//these functions do not check level versus ESP_LOCAL_LEVEL, this should be done in esp_log.h void esp_log_buffer_hex_internal(const char *tag, const void *buffer, uint16_t buff_len, esp_log_level_t level); void esp_log_buffer_char_internal(const char *tag, const void *buffer, uint16_t buff_len, esp_log_level_t level); void esp_log_buffer_hexdump_internal( const char *tag, const void *buffer, uint16_t buff_len, esp_log_level_t log_level);