From 676e668811680238aec9a70f21ec960877d5dc6a Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 13 Mar 2026 18:25:05 -1000 Subject: [PATCH] revert --- esphome/components/esp32/__init__.py | 5 -- esphome/core/log.cpp | 77 ---------------------------- 2 files changed, 82 deletions(-) diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py index e225721d90a..475de6aa3e4 100644 --- a/esphome/components/esp32/__init__.py +++ b/esphome/components/esp32/__init__.py @@ -1614,11 +1614,6 @@ async def to_code(config): # This saves ~250 bytes of RAM (tag cache) and associated code add_idf_sdkconfig_option("CONFIG_LOG_TAG_LEVEL_IMPL_NONE", True) - # Use ESP-IDF Log V2 to eliminate per-site esp_log_timestamp() macro expansions - # V2 centralizes formatting inside esp_log(), reducing flash usage - add_idf_sdkconfig_option("CONFIG_LOG_VERSION_1", False) - add_idf_sdkconfig_option("CONFIG_LOG_VERSION_2", True) - # Reduce PHY TX power in the event of a brownout add_idf_sdkconfig_option("CONFIG_ESP_PHY_REDUCE_TX_POWER", True) diff --git a/esphome/core/log.cpp b/esphome/core/log.cpp index 705717b3177..0da457adec2 100644 --- a/esphome/core/log.cpp +++ b/esphome/core/log.cpp @@ -86,80 +86,3 @@ int HOT esp_idf_log_vprintf_(const char *format, va_list args) { // NOLINT #endif } // namespace esphome - -#if defined(USE_ESP32) && !defined(BOOTLOADER_BUILD) -// Override esp_log_format to disable ESP-IDF's own log formatting so that -// the vprintf hook receives a single call per message (just the user's format -// string + args). Without this, Log V2 makes 3 vprintf calls per message -// (header, body, newline) which fragments the output in ESPHome's logger. -// This strong definition overrides the archive symbol from ESP-IDF's liblog. -// It affects all callers including precompiled blobs (e.g. wifi). -// -// Before the ESPHome logger hook is installed (early boot), we fall through -// to the original ESP-IDF formatting so boot messages have proper formatting. -#include -#include -#include -#include - -// Outlined cold path for early boot / constrained environment logging. -// Uses esp_log_printf/esp_log_vprintf which dispatch to esp_rom_vprintf -// for constrained environments (same as ESP-IDF's original esp_log_format). -// Must be in IRAM since it's called from the IRAM esp_log_format during -// early boot when the scheduler isn't running (constrained_env=1). -static void IRAM_ATTR __attribute__((noinline)) esp_log_format_early_(esp_log_msg_t *message) { - // ESP-IDF levels: NONE=0 ERROR=1 WARN=2 INFO=3 DEBUG=4 VERBOSE=5 - // Color digits: E=1(red) W=3(yellow) I=2(green) D=6(cyan) V=7(gray) - // DRAM_ATTR required: this function is IRAM_ATTR and may be called from constrained - // environments where flash cache is disabled. All string constants must be in DRAM. - // ESP-IDF's own log_format_text.c achieves this via linker fragment (noflash), but - // our override is in a different compilation unit so we must use DRAM_ATTR explicitly. - static DRAM_ATTR const char color_digit[] = {'\0', '1', '3', '2', '6', '7'}; - static DRAM_ATTR const char lvl[] = {'\0', 'E', 'W', 'I', 'D', 'V'}; - static DRAM_ATTR const char fmt_header[] = "\033[0;3%cm[%c][%s]: "; - static DRAM_ATTR const char fmt_reset_nl[] = "\033[0m\n"; - static DRAM_ATTR const char fmt_nl[] = "\n"; - static DRAM_ATTR const char tag_fallback[] = "idf"; - uint8_t level = message->config.opts.log_level; -#if CONFIG_LIBC_NEWLIB - if (!message->config.opts.constrained_env) { - flockfile(stdout); - } -#endif - if (level > 0 && level < sizeof(lvl)) { - esp_log_printf(message->config, fmt_header, color_digit[level], lvl[level], - message->tag ? message->tag : tag_fallback); - } - esp_log_vprintf(message->config, message->format, message->args); - if (level > 0 && level < sizeof(lvl)) { - esp_log_printf(message->config, fmt_reset_nl); - } else { - esp_log_printf(message->config, fmt_nl); - } -#if CONFIG_LIBC_NEWLIB - if (!message->config.opts.constrained_env) { - funlockfile(stdout); - } -#endif -} - -extern "C" { -// IRAM_ATTR required because ESP-IDF places esp_log_format in IRAM when -// CONFIG_LOG_IN_IRAM is enabled, and it may be called from constrained -// environments (ISR, cache disabled) where flash is inaccessible. -void IRAM_ATTR esp_log_format(esp_log_msg_t *message) { - // Check if ESPHome's vprintf hook is installed by comparing against default. - // Before logger init, esp_log_vprint_func == &vprintf (the default). - extern vprintf_like_t esp_log_vprint_func; - extern int vprintf(const char *, __gnuc_va_list); // NOLINT - if (esp_log_vprint_func == &vprintf || message->config.opts.constrained_env) [[unlikely]] { - // Early boot or constrained env (ISR, cache disabled): - // use ROM functions only — flash may be inaccessible. - esp_log_format_early_(message); - return; - } - // After hook installed, normal environment: skip formatting, forward body only - esp_log_vprintf(message->config, message->format, message->args); -} -} // extern "C" -#endif