From c13bbd300dff403c5b2e4bc408c9c437788e1583 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Tue, 30 Dec 2025 13:24:32 -1000 Subject: [PATCH] tweaks --- esphome/core/gpio.cpp | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/esphome/core/gpio.cpp b/esphome/core/gpio.cpp index 5dce88a915..735ae2fcba 100644 --- a/esphome/core/gpio.cpp +++ b/esphome/core/gpio.cpp @@ -6,29 +6,7 @@ namespace esphome { -#ifdef USE_ESP8266 - -static constexpr size_t LOG_PIN_PREFIX_MAX_LEN = 32; - -void log_pin(const char *tag, const __FlashStringHelper *prefix, GPIOPin *pin) { - if (pin == nullptr) - return; - char buffer[GPIO_SUMMARY_MAX_LEN]; - size_t len = pin->dump_summary(buffer, sizeof(buffer)); - // Clamp to actual buffer size (snprintf returns would-be length) - len = std::min(len, sizeof(buffer) - 1); - // Copy prefix from flash to stack, then format - char prefix_buf[LOG_PIN_PREFIX_MAX_LEN]; - strncpy_P(prefix_buf, reinterpret_cast(prefix), sizeof(prefix_buf) - 1); - prefix_buf[sizeof(prefix_buf) - 1] = '\0'; - esp_log_printf_(ESPHOME_LOG_LEVEL_CONFIG, tag, __LINE__, "%s%.*s", prefix_buf, (int) len, buffer); -} - -#else - -void log_pin(const char *tag, const char *prefix, GPIOPin *pin) { - if (pin == nullptr) - return; +static void log_pin_with_prefix(const char *tag, const char *prefix, GPIOPin *pin) { char buffer[GPIO_SUMMARY_MAX_LEN]; size_t len = pin->dump_summary(buffer, sizeof(buffer)); // Clamp to actual buffer size (snprintf returns would-be length) @@ -36,6 +14,28 @@ void log_pin(const char *tag, const char *prefix, GPIOPin *pin) { esp_log_printf_(ESPHOME_LOG_LEVEL_CONFIG, tag, __LINE__, "%s%.*s", prefix, (int) len, buffer); } +#ifdef USE_ESP8266 + +static constexpr size_t LOG_PIN_PREFIX_MAX_LEN = 32; + +void log_pin(const char *tag, const __FlashStringHelper *prefix, GPIOPin *pin) { + if (pin == nullptr) + return; + // Copy prefix from flash to stack + char prefix_buf[LOG_PIN_PREFIX_MAX_LEN]; + strncpy_P(prefix_buf, reinterpret_cast(prefix), sizeof(prefix_buf) - 1); + prefix_buf[sizeof(prefix_buf) - 1] = '\0'; + log_pin_with_prefix(tag, prefix_buf, pin); +} + +#else + +void log_pin(const char *tag, const char *prefix, GPIOPin *pin) { + if (pin == nullptr) + return; + log_pin_with_prefix(tag, prefix, pin); +} + #endif } // namespace esphome