From 79c79c31e178329a834287eb0d16fd1a335d5fe5 Mon Sep 17 00:00:00 2001 From: Tomasz Duda Date: Mon, 26 Feb 2024 15:46:38 +0100 Subject: [PATCH] rename logger --- .../{logger_nrf52.cpp => logger_zephyr.cpp} | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) rename esphome/components/logger/{logger_nrf52.cpp => logger_zephyr.cpp} (78%) diff --git a/esphome/components/logger/logger_nrf52.cpp b/esphome/components/logger/logger_zephyr.cpp similarity index 78% rename from esphome/components/logger/logger_nrf52.cpp rename to esphome/components/logger/logger_zephyr.cpp index 4ecb52180a..d53856755d 100644 --- a/esphome/components/logger/logger_nrf52.cpp +++ b/esphome/components/logger/logger_zephyr.cpp @@ -1,23 +1,18 @@ -#ifdef USE_NRF52 -#ifdef USE_ARDUINO -#include // for Serial -#endif +#ifdef USE_ZEPHYR + #include "logger.h" #include "esphome/core/log.h" #include "esphome/core/application.h" -#ifdef USE_ZEPHYR #include #include #include -#endif namespace esphome { namespace logger { static const char *const TAG = "logger"; -#ifdef USE_ZEPHYR void Logger::loop() { if (this->uart_ != UART_SELECTION_USB_CDC || nullptr == uart_dev_) { return; @@ -36,22 +31,9 @@ void Logger::loop() { } opened = !opened; } -#endif void Logger::pre_setup() { if (this->baud_rate_ > 0) { -#ifdef USE_ARDUINO - switch (this->uart_) { - case UART_SELECTION_UART0: - this->hw_serial_ = &Serial1; - Serial1.begin(this->baud_rate_); - break; - case UART_SELECTION_USB_CDC: - this->hw_serial_ = &Serial; - Serial.begin(this->baud_rate_); - break; - } -#elif defined(USE_ZEPHYR) static const struct device *uart_dev = nullptr; switch (this->uart_) { case UART_SELECTION_UART0: @@ -69,13 +51,11 @@ void Logger::pre_setup() { } else { uart_dev_ = uart_dev; } -#endif } global_logger = this; ESP_LOGI(TAG, "Log initialized"); } -#ifdef USE_ZEPHYR void HOT Logger::write_msg_(const char *msg) { #ifdef CONFIG_PRINTK printk("%s\n", msg); @@ -89,7 +69,6 @@ void HOT Logger::write_msg_(const char *msg) { } uart_poll_out(uart_dev_, '\n'); } -#endif const char *const UART_SELECTIONS[] = {"UART0", "USB_CDC"};