sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-03 11:52:20 +01:00
Code Issues Releases Wiki Activity

rename logger

Browse Source
This commit is contained in:
Tomasz Duda
2024-02-26 15:46:38 +01:00
parent 6c73545954
commit 79c79c31e1
1 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
esphome/components/logger/logger_nrf52.cpp → esphome/components/logger/logger_zephyr.cpp
View File

@@ -1,23 +1,18 @@
#ifdef USE_NRF52 #ifdef USE_ZEPHYR
#ifdef USE_ARDUINO
#include <Adafruit_TinyUSB.h> // for Serial
#endif
#include "logger.h" #include "logger.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include "esphome/core/application.h" #include "esphome/core/application.h"
#ifdef USE_ZEPHYR
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/drivers/uart.h> #include <zephyr/drivers/uart.h>
#include <zephyr/usb/usb_device.h> #include <zephyr/usb/usb_device.h>
#endif
namespace esphome { namespace esphome {
namespace logger { namespace logger {
static const char *const TAG = "logger"; static const char *const TAG = "logger";
#ifdef USE_ZEPHYR
void Logger::loop() { void Logger::loop() {
if (this->uart_ != UART_SELECTION_USB_CDC || nullptr == uart_dev_) { if (this->uart_ != UART_SELECTION_USB_CDC || nullptr == uart_dev_) {
return; return;
@@ -36,22 +31,9 @@ void Logger::loop() {
} }
opened = !opened; opened = !opened;
} }
#endif
void Logger::pre_setup() { void Logger::pre_setup() {
if (this->baud_rate_ > 0) { 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; static const struct device *uart_dev = nullptr;
switch (this->uart_) { switch (this->uart_) {
case UART_SELECTION_UART0: case UART_SELECTION_UART0:
@@ -69,13 +51,11 @@ void Logger::pre_setup() {
} else { } else {
uart_dev_ = uart_dev; uart_dev_ = uart_dev;
} }
#endif
} }
global_logger = this; global_logger = this;
ESP_LOGI(TAG, "Log initialized"); ESP_LOGI(TAG, "Log initialized");
} }
#ifdef USE_ZEPHYR
void HOT Logger::write_msg_(const char *msg) { void HOT Logger::write_msg_(const char *msg) {
#ifdef CONFIG_PRINTK #ifdef CONFIG_PRINTK
printk("%s\n", msg); printk("%s\n", msg);
@@ -89,7 +69,6 @@ void HOT Logger::write_msg_(const char *msg) {
} }
uart_poll_out(uart_dev_, '\n'); uart_poll_out(uart_dev_, '\n');
} }
#endif
const char *const UART_SELECTIONS[] = {"UART0", "USB_CDC"}; const char *const UART_SELECTIONS[] = {"UART0", "USB_CDC"};