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

standard way

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-05 13:21:54 -05:00
parent c311ed9e15
commit 47fac7c99a
7 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/logger/logger.cpp
View File

@@ -258,7 +258,7 @@ void Logger::dump_config() {
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
" Log Baud Rate: %" PRIu32 "\n" " Log Baud Rate: %" PRIu32 "\n"
" Hardware UART: %s", " Hardware UART: %s",
this->baud_rate_, get_uart_selection_()); this->baud_rate_, LOG_STR_ARG(get_uart_selection_()));
#endif #endif
#ifdef USE_ESPHOME_TASK_LOG_BUFFER #ifdef USE_ESPHOME_TASK_LOG_BUFFER
if (this->log_buffer_) { if (this->log_buffer_) {

2
esphome/components/logger/logger.h
View File

@@ -226,7 +226,7 @@ class Logger : public Component {
} }
#ifndef USE_HOST #ifndef USE_HOST
const char *get_uart_selection_(); const LogString *get_uart_selection_();
#endif #endif
// Group 4-byte aligned members first // Group 4-byte aligned members first

24
esphome/components/logger/logger_esp32.cpp
View File

@@ -190,20 +190,28 @@ void HOT Logger::write_msg_(const char *msg) {
void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); } void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
#endif #endif
const char *const UART_SELECTIONS[] = { const LogString *Logger::get_uart_selection_() {
"UART0", "UART1", switch (this->uart_) {
case UART_SELECTION_UART0:
return LOG_STR("UART0");
case UART_SELECTION_UART1:
return LOG_STR("UART1");
#ifdef USE_ESP32_VARIANT_ESP32 #ifdef USE_ESP32_VARIANT_ESP32
"UART2", case UART_SELECTION_UART2:
return LOG_STR("UART2");
#endif #endif
#ifdef USE_LOGGER_USB_CDC #ifdef USE_LOGGER_USB_CDC
"USB_CDC", case UART_SELECTION_USB_CDC:
return LOG_STR("USB_CDC");
#endif #endif
#ifdef USE_LOGGER_USB_SERIAL_JTAG #ifdef USE_LOGGER_USB_SERIAL_JTAG
"USB_SERIAL_JTAG", case UART_SELECTION_USB_SERIAL_JTAG:
return LOG_STR("USB_SERIAL_JTAG");
#endif #endif
}; default:
return LOG_STR("UNKNOWN");
const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; } }
}
} // namespace esphome::logger } // namespace esphome::logger
#endif #endif

20
esphome/components/logger/logger_esp8266.cpp
View File

@@ -2,9 +2,6 @@
#include "logger.h" #include "logger.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
#include <Arduino.h>
#include <pgmspace.h>
namespace esphome::logger { namespace esphome::logger {
static const char *const TAG = "logger"; static const char *const TAG = "logger";
@@ -38,12 +35,17 @@ void Logger::pre_setup() {
void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); } void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
static const char UART0_STR[] PROGMEM = "UART0"; const LogString *Logger::get_uart_selection_() {
static const char UART1_STR[] PROGMEM = "UART1"; switch (this->uart_) {
static const char UART0_SWAP_STR[] PROGMEM = "UART0_SWAP"; case UART_SELECTION_UART0:
static const char *const UART_SELECTIONS[] PROGMEM = {UART0_STR, UART1_STR, UART0_SWAP_STR}; return LOG_STR("UART0");
case UART_SELECTION_UART1:
const char *Logger::get_uart_selection_() { return (const char *) pgm_read_ptr(&UART_SELECTIONS[this->uart_]); } return LOG_STR("UART1");
case UART_SELECTION_UART0_SWAP:
default:
return LOG_STR("UART0_SWAP");
}
}
} // namespace esphome::logger } // namespace esphome::logger
#endif #endif

16
esphome/components/logger/logger_libretiny.cpp
View File

@@ -51,9 +51,19 @@ void Logger::pre_setup() {
void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); } void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
const char *const UART_SELECTIONS[] = {"DEFAULT", "UART0", "UART1", "UART2"}; const LogString *Logger::get_uart_selection_() {
switch (this->uart_) {
const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; } case UART_SELECTION_DEFAULT:
return LOG_STR("DEFAULT");
case UART_SELECTION_UART0:
return LOG_STR("UART0");
case UART_SELECTION_UART1:
return LOG_STR("UART1");
case UART_SELECTION_UART2:
default:
return LOG_STR("UART2");
}
}
} // namespace esphome::logger } // namespace esphome::logger

14
esphome/components/logger/logger_rp2040.cpp
View File

@@ -29,9 +29,17 @@ void Logger::pre_setup() {
void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); } void HOT Logger::write_msg_(const char *msg) { this->hw_serial_->println(msg); }
const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"}; const LogString *Logger::get_uart_selection_() {
switch (this->uart_) {
const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; } case UART_SELECTION_UART0:
return LOG_STR("UART0");
case UART_SELECTION_UART1:
return LOG_STR("UART1");
case UART_SELECTION_USB_CDC:
default:
return LOG_STR("USB_CDC");
}
}
} // namespace esphome::logger } // namespace esphome::logger
#endif // USE_RP2040 #endif // USE_RP2040

16
esphome/components/logger/logger_zephyr.cpp
View File

@@ -54,7 +54,7 @@ void Logger::pre_setup() {
#endif #endif
} }
if (!device_is_ready(uart_dev)) { if (!device_is_ready(uart_dev)) {
ESP_LOGE(TAG, "%s is not ready.", get_uart_selection_()); ESP_LOGE(TAG, "%s is not ready.", LOG_STR_ARG(get_uart_selection_()));
} else { } else {
this->uart_dev_ = uart_dev; this->uart_dev_ = uart_dev;
} }
@@ -77,9 +77,17 @@ void HOT Logger::write_msg_(const char *msg) {
uart_poll_out(this->uart_dev_, '\n'); uart_poll_out(this->uart_dev_, '\n');
} }
const char *const UART_SELECTIONS[] = {"UART0", "UART1", "USB_CDC"}; const LogString *Logger::get_uart_selection_() {
switch (this->uart_) {
const char *Logger::get_uart_selection_() { return UART_SELECTIONS[this->uart_]; } case UART_SELECTION_UART0:
return LOG_STR("UART0");
case UART_SELECTION_UART1:
return LOG_STR("UART1");
case UART_SELECTION_USB_CDC:
default:
return LOG_STR("USB_CDC");
}
}
} // namespace esphome::logger } // namespace esphome::logger