diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index 445b93f10e..ebe94326db 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -59,7 +59,7 @@ PSEUDOMODULES += esp_hw_counter PSEUDOMODULES += esp_i2c_sw PSEUDOMODULES += esp_i2c_hw PSEUDOMODULES += esp_idf_newlib -PSEUDOMODULES += esp_log_color +PSEUDOMODULES += esp_log_colored PSEUDOMODULES += esp_log_tagged PSEUDOMODULES += esp_spi_ram PSEUDOMODULES += esp_spiffs @@ -136,7 +136,7 @@ ifeq ($(QEMU), 1) CFLAGS += -DQEMU endif -ifneq (,$(filter esp_log_color,$(USEMODULE))) +ifneq (,$(filter esp_log_colored,$(USEMODULE))) BOOTLOADER_BIN = bootloader_with_colors.bin else BOOTLOADER_BIN = bootloader_without_colors.bin diff --git a/cpu/esp32/include/esp_common_log.h b/cpu/esp32/include/esp_common_log.h index 82c5b66d21..ecfc71a681 100644 --- a/cpu/esp32/include/esp_common_log.h +++ b/cpu/esp32/include/esp_common_log.h @@ -33,7 +33,7 @@ extern "C" { extern uint32_t system_get_time_ms (void); -#if MODULE_ESP_LOG_COLOR +#if MODULE_ESP_LOG_COLORED #define LOG_COLOR_RED "31" #define LOG_COLOR_GREEN "32" @@ -46,7 +46,7 @@ extern uint32_t system_get_time_ms (void); #define LOG_COLOR_D #define LOG_COLOR_V -#else /* MODULE_ESP_LOG_COLOR */ +#else /* MODULE_ESP_LOG_COLORED */ #define LOG_COLOR_E #define LOG_COLOR_W @@ -55,7 +55,7 @@ extern uint32_t system_get_time_ms (void); #define LOG_COLOR_V #define LOG_RESET_COLOR -#endif /* MODULE_ESP_LOG_COLOR */ +#endif /* MODULE_ESP_LOG_COLORED */ #if MODULE_ESP_LOG_TAGGED diff --git a/cpu/esp32/vendor/esp-idf/esp_funcs.c b/cpu/esp32/vendor/esp-idf/esp_funcs.c index 16c343f9c3..b7914693f5 100644 --- a/cpu/esp32/vendor/esp-idf/esp_funcs.c +++ b/cpu/esp32/vendor/esp-idf/esp_funcs.c @@ -96,7 +96,7 @@ uint32_t IRAM_ATTR esp_log_timestamp(void) printf(LOG_COLOR_ ## letter "[%s] ", tag) #endif -#if MODULE_ESP_LOG_COLOR +#if MODULE_ESP_LOG_COLORED #define ESP_LOG_SUFFIX() printf(LOG_RESET_COLOR) #else #define ESP_LOG_SUFFIX()