kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 14:03:55 +01:00
Code Releases Activity

cpu/esp32: esp_log_color renamed to esp_log_colored

Browse Source
This commit is contained in:
Schorcht 2019-08-20 18:22:35 +02:00 committed by Gunar Schorcht
parent 5d51c03af9
commit 4503f45abb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/esp32/Makefile.include
View File

@ -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

6
cpu/esp32/include/esp_common_log.h
View File

@ -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

2
cpu/esp32/vendor/esp-idf/esp_funcs.c vendored
View File

@ -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()