Added possibility to use ESP32-IDF log insted of redefined one (#4845)
With this PR user can select to use the original ESP-IDF log instead of the redefined one. User can also redefine the log function as per [Logging Library](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/log.html#_CPPv419esp_log_set_vprintf14vprintf_like_t) so he can for example redirect logs to a file. To enable this change just add -DUSE_ESP32_LOG to build flags. User can also change the default TAG (that now is ES32) to whatever it wants adding '-DTAG="tag_value"' to build flags
This commit is contained in:
parent
2141313148
commit
b8dab5ed1a
@ -7,6 +7,7 @@ set(CORE_SRCS
|
|||||||
cores/esp32/esp32-hal-dac.c
|
cores/esp32/esp32-hal-dac.c
|
||||||
cores/esp32/esp32-hal-gpio.c
|
cores/esp32/esp32-hal-gpio.c
|
||||||
cores/esp32/esp32-hal-i2c.c
|
cores/esp32/esp32-hal-i2c.c
|
||||||
|
cores/esp32/esp32-hal-log.c
|
||||||
cores/esp32/esp32-hal-ledc.c
|
cores/esp32/esp32-hal-ledc.c
|
||||||
cores/esp32/esp32-hal-matrix.c
|
cores/esp32/esp32-hal-matrix.c
|
||||||
cores/esp32/esp32-hal-misc.c
|
cores/esp32/esp32-hal-misc.c
|
||||||
|
19
cores/esp32/esp32-hal-log.c
Normal file
19
cores/esp32/esp32-hal-log.c
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#ifndef __MY_LOG__
|
||||||
|
#define __MY_LOG__
|
||||||
|
#include "stdio.h"
|
||||||
|
#include "esp32-hal-log.h"
|
||||||
|
void log_to_esp(char* tag, esp_log_level_t level, const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list va_args;
|
||||||
|
va_start(va_args, format);
|
||||||
|
|
||||||
|
char log_buffer[512];
|
||||||
|
int len = vsnprintf(log_buffer, sizeof(log_buffer), format, va_args);
|
||||||
|
if (len > 0)
|
||||||
|
{
|
||||||
|
ESP_LOG_LEVEL_LOCAL(level, tag, "%s", log_buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
va_end(va_args);
|
||||||
|
}
|
||||||
|
#endif
|
@ -1,4 +1,4 @@
|
|||||||
// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD
|
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@ -11,7 +11,6 @@
|
|||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
#ifndef __ARDUHAL_LOG_H__
|
#ifndef __ARDUHAL_LOG_H__
|
||||||
#define __ARDUHAL_LOG_H__
|
#define __ARDUHAL_LOG_H__
|
||||||
|
|
||||||
@ -37,6 +36,9 @@ extern "C"
|
|||||||
#define ARDUHAL_LOG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
|
#define ARDUHAL_LOG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
|
||||||
#else
|
#else
|
||||||
#define ARDUHAL_LOG_LEVEL CORE_DEBUG_LEVEL
|
#define ARDUHAL_LOG_LEVEL CORE_DEBUG_LEVEL
|
||||||
|
#ifdef USE_ESP_IDF_LOG
|
||||||
|
#define LOG_LOCAL_LEVEL CORE_DEBUG_LEVEL
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_ARDUHAL_LOG_COLORS
|
#ifndef CONFIG_ARDUHAL_LOG_COLORS
|
||||||
@ -72,6 +74,8 @@ extern "C"
|
|||||||
#define ARDUHAL_LOG_RESET_COLOR
|
#define ARDUHAL_LOG_RESET_COLOR
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const char * pathToFileName(const char * path);
|
const char * pathToFileName(const char * path);
|
||||||
int log_printf(const char *fmt, ...);
|
int log_printf(const char *fmt, ...);
|
||||||
|
|
||||||
@ -79,55 +83,92 @@ int log_printf(const char *fmt, ...);
|
|||||||
#define ARDUHAL_LOG_FORMAT(letter, format) ARDUHAL_LOG_COLOR_ ## letter "[" #letter "][%s:%u] %s(): " format ARDUHAL_LOG_RESET_COLOR "\r\n", pathToFileName(__FILE__), __LINE__, __FUNCTION__
|
#define ARDUHAL_LOG_FORMAT(letter, format) ARDUHAL_LOG_COLOR_ ## letter "[" #letter "][%s:%u] %s(): " format ARDUHAL_LOG_RESET_COLOR "\r\n", pathToFileName(__FILE__), __LINE__, __FUNCTION__
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_v(format, ...) log_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
|
#define log_v(format, ...) log_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
|
||||||
#define isr_log_v(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
|
#define isr_log_v(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_v(format, ...) do {log_to_esp(TAG, ESP_LOG_VERBOSE, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_v(format, ...) do {ets_printf(LOG_FORMAT(V, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_v(format, ...)
|
#define log_v(format, ...)
|
||||||
#define isr_log_v(format, ...)
|
#define isr_log_v(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_d(format, ...) log_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
|
#define log_d(format, ...) log_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
|
||||||
#define isr_log_d(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
|
#define isr_log_d(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_d(format, ...) do {log_to_esp(TAG, ESP_LOG_DEBUG, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_d(format, ...) do {ets_printf(LOG_FORMAT(D, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_d(format, ...)
|
#define log_d(format, ...)
|
||||||
#define isr_log_d(format, ...)
|
#define isr_log_d(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_i(format, ...) log_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
|
#define log_i(format, ...) log_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
|
||||||
#define isr_log_i(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
|
#define isr_log_i(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_i(format, ...) do {log_to_esp(TAG, ESP_LOG_INFO, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_i(format, ...) do {ets_printf(LOG_FORMAT(I, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_i(format, ...)
|
#define log_i(format, ...)
|
||||||
#define isr_log_i(format, ...)
|
#define isr_log_i(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_w(format, ...) log_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
|
#define log_w(format, ...) log_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
|
||||||
#define isr_log_w(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
|
#define isr_log_w(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_w(format, ...) do {log_to_esp(TAG, ESP_LOG_WARN, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_w(format, ...) do {ets_printf(LOG_FORMAT(W, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_w(format, ...)
|
#define log_w(format, ...)
|
||||||
#define isr_log_w(format, ...)
|
#define isr_log_w(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_e(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
#define log_e(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
||||||
#define isr_log_e(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
#define isr_log_e(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_e(format, ...) do {log_to_esp(TAG, ESP_LOG_ERROR, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_e(format, ...) do {ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_e(format, ...)
|
#define log_e(format, ...)
|
||||||
#define isr_log_e(format, ...)
|
#define isr_log_e(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_NONE
|
#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_NONE
|
||||||
|
#ifndef USE_ESP_IDF_LOG
|
||||||
#define log_n(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
#define log_n(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
||||||
#define isr_log_n(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
#define isr_log_n(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
|
||||||
#else
|
#else
|
||||||
|
#define log_n(format, ...) do {log_to_esp(TAG, ESP_LOG_ERROR, format, ##__VA_ARGS__);}while(0)
|
||||||
|
#define isr_log_n(format, ...) do {ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__);}while(0)
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
#define log_n(format, ...)
|
#define log_n(format, ...)
|
||||||
#define isr_log_n(format, ...)
|
#define isr_log_n(format, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "esp_log.h"
|
#include "esp_log.h"
|
||||||
|
|
||||||
|
#ifdef USE_ESP_IDF_LOG
|
||||||
|
#ifndef TAG
|
||||||
|
#define TAG "ARDUINO"
|
||||||
|
#endif
|
||||||
|
void log_to_esp(char* tag, esp_log_level_t level, const char* format, ...);
|
||||||
|
//#define log_n(format, ...) myLog(ESP_LOG_NONE, format, ##__VA_ARGS__)
|
||||||
|
#else
|
||||||
#ifdef CONFIG_ARDUHAL_ESP_LOG
|
#ifdef CONFIG_ARDUHAL_ESP_LOG
|
||||||
#undef ESP_LOGE
|
#undef ESP_LOGE
|
||||||
#undef ESP_LOGW
|
#undef ESP_LOGW
|
||||||
@ -151,6 +192,7 @@ int log_printf(const char *fmt, ...);
|
|||||||
#define ESP_EARLY_LOGD(tag, ...) isr_log_d(__VA_ARGS__)
|
#define ESP_EARLY_LOGD(tag, ...) isr_log_d(__VA_ARGS__)
|
||||||
#define ESP_EARLY_LOGV(tag, ...) isr_log_v(__VA_ARGS__)
|
#define ESP_EARLY_LOGV(tag, ...) isr_log_v(__VA_ARGS__)
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user