Added possibility to use ESP32-IDF log insted of redefined one (espressif#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

Author: martirius

CMakeLists.txt

@@ -7,6 +7,7 @@ set(CORE_SRCS
  cores/esp32/esp32-hal-dac.c
  cores/esp32/esp32-hal-gpio.c
  cores/esp32/esp32-hal-i2c.c
+ cores/esp32/esp32-hal-log.c
  cores/esp32/esp32-hal-ledc.c
  cores/esp32/esp32-hal-matrix.c
  cores/esp32/esp32-hal-misc.c

cores/esp32/esp32-hal-log.c

@@ -0,0 +1,19 @@
+#ifndef__MY_LOG__
+#define__MY_LOG__
+#include"stdio.h"
+#include"esp32-hal-log.h"
+voidlog_to_esp(char*tag, esp_log_level_tlevel, constchar*format, ...)
+{
+va_listva_args;
+va_start(va_args, format);
+
+charlog_buffer[512];
+intlen=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

cores/esp32/esp32-hal-log.h

@@ -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");
 // 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.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
 #ifndef__ARDUHAL_LOG_H__
 #define__ARDUHAL_LOG_H__
 
@@ -37,6 +36,9 @@ extern "C"
 #defineARDUHAL_LOG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
 #else
 #defineARDUHAL_LOG_LEVEL CORE_DEBUG_LEVEL
+#ifdefUSE_ESP_IDF_LOG
+#defineLOG_LOCAL_LEVEL CORE_DEBUG_LEVEL
+#endif
 #endif
 
 #ifndefCONFIG_ARDUHAL_LOG_COLORS
@@ -72,62 +74,101 @@ extern "C"
 #defineARDUHAL_LOG_RESET_COLOR
 #endif
 
+
+
 constchar*pathToFileName(constchar*path);
 intlog_printf(constchar*fmt, ...);
 
 #defineARDUHAL_SHORT_LOG_FORMAT(letter, format) ARDUHAL_LOG_COLOR_ ## letter format ARDUHAL_LOG_RESET_COLOR "\r\n"
 #defineARDUHAL_LOG_FORMAT(letter, format) ARDUHAL_LOG_COLOR_ ## letter "[" #letter "][%s:%u] %s(): " format ARDUHAL_LOG_RESET_COLOR "\r\n", pathToFileName(__FILE__), __LINE__, __FUNCTION__
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
+#ifndefUSE_ESP_IDF_LOG
 #definelog_v(format, ...) log_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
 #defineisr_log_v(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(V, format), ##__VA_ARGS__)
 #else
+#definelog_v(format, ...) do{log_to_esp(TAG, ESP_LOG_VERBOSE, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_v(format, ...) do{ets_printf(LOG_FORMAT(V, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_v(format, ...)
 #defineisr_log_v(format, ...)
 #endif
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_DEBUG
+#ifndefUSE_ESP_IDF_LOG
 #definelog_d(format, ...) log_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
 #defineisr_log_d(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(D, format), ##__VA_ARGS__)
 #else
+#definelog_d(format, ...) do{log_to_esp(TAG, ESP_LOG_DEBUG, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_d(format, ...) do{ets_printf(LOG_FORMAT(D, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_d(format, ...)
 #defineisr_log_d(format, ...)
 #endif
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
+#ifndefUSE_ESP_IDF_LOG
 #definelog_i(format, ...) log_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
 #defineisr_log_i(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(I, format), ##__VA_ARGS__)
 #else
+#definelog_i(format, ...) do{log_to_esp(TAG, ESP_LOG_INFO, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_i(format, ...) do{ets_printf(LOG_FORMAT(I, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_i(format, ...)
 #defineisr_log_i(format, ...)
 #endif
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_WARN
+#ifndefUSE_ESP_IDF_LOG
 #definelog_w(format, ...) log_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
 #defineisr_log_w(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(W, format), ##__VA_ARGS__)
 #else
+#definelog_w(format, ...) do{log_to_esp(TAG, ESP_LOG_WARN, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_w(format, ...) do{ets_printf(LOG_FORMAT(W, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_w(format, ...)
 #defineisr_log_w(format, ...)
 #endif
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+#ifndefUSE_ESP_IDF_LOG
 #definelog_e(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
 #defineisr_log_e(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
 #else
+#definelog_e(format, ...) do{log_to_esp(TAG, ESP_LOG_ERROR, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_e(format, ...) do{ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_e(format, ...)
 #defineisr_log_e(format, ...)
 #endif
 
 #ifARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_NONE
+#ifndefUSE_ESP_IDF_LOG
 #definelog_n(format, ...) log_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
 #defineisr_log_n(format, ...) ets_printf(ARDUHAL_LOG_FORMAT(E, format), ##__VA_ARGS__)
 #else
+#definelog_n(format, ...) do{log_to_esp(TAG, ESP_LOG_ERROR, format, ##__VA_ARGS__)}while(0)
+#defineisr_log_n(format, ...) do{ets_printf(LOG_FORMAT(E, format), esp_log_timestamp(), TAG, ##__VA_ARGS__)}while(0)
+#endif
+#else
 #definelog_n(format, ...)
 #defineisr_log_n(format, ...)
 #endif
 
 #include"esp_log.h"
 
+#ifdefUSE_ESP_IDF_LOG
+#ifndefTAG
+#defineTAG "ARDUINO"
+#endif
+voidlog_to_esp(char*tag, esp_log_level_tlevel, constchar*format, ...);
+//#define log_n(format, ...) myLog(ESP_LOG_NONE, format, ##__VA_ARGS__)
+#else
 #ifdefCONFIG_ARDUHAL_ESP_LOG
 #undef ESP_LOGE
 #undef ESP_LOGW
@@ -151,6 +192,7 @@ int log_printf(const char *fmt, ...);
 #defineESP_EARLY_LOGD(tag, ...) isr_log_d(__VA_ARGS__)
 #defineESP_EARLY_LOGV(tag, ...) isr_log_v(__VA_ARGS__)
 #endif
+#endif
 
 #ifdef__cplusplus
 }