mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-20 16:35:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

[logger] Exclude unused Arduino Serial objects on ESP8266

Browse Source
This commit is contained in:
J. Nick Koston
2025-12-29 13:06:33 -10:00
parent d0673122a8
commit c09f555e18
2 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/logger/__init__.py
View File

@@ -337,6 +337,22 @@ async def to_code(config):
is_at_least_very_verbose = this_severity >= very_verbose_severity
has_serial_logging = baud_rate != 0
# Add defines for which Serial object is needed (allows linker to exclude unused)
if CORE.is_esp8266:
hw_uart = config.get(CONF_HARDWARE_UART, UART0)
if has_serial_logging and hw_uart in (UART0, UART0_SWAP):
cg.add_define("USE_ESP8266_LOGGER_SERIAL")
# Exclude Serial1 from Arduino build
cg.add_build_flag("-DNO_GLOBAL_SERIAL1")
elif has_serial_logging and hw_uart == UART1:
cg.add_define("USE_ESP8266_LOGGER_SERIAL1")
# Exclude Serial from Arduino build
cg.add_build_flag("-DNO_GLOBAL_SERIAL")
else:
# No serial logging - exclude both
cg.add_build_flag("-DNO_GLOBAL_SERIAL")
cg.add_build_flag("-DNO_GLOBAL_SERIAL1")
if (
(CORE.is_esp8266 or CORE.is_rp2040)
and has_serial_logging

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

@@ -7,26 +7,21 @@ namespace esphome::logger {
static const char *const TAG = "logger";
void Logger::pre_setup() {
if (this->baud_rate_ > 0) {
switch (this->uart_) {
case UART_SELECTION_UART0:
case UART_SELECTION_UART0_SWAP:
this->hw_serial_ = &Serial;
Serial.begin(this->baud_rate_);
if (this->uart_ == UART_SELECTION_UART0_SWAP) {
Serial.swap();
}
Serial.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
break;
case UART_SELECTION_UART1:
this->hw_serial_ = &Serial1;
Serial1.begin(this->baud_rate_);
Serial1.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
break;
}
} else {
uart_set_debug(UART_NO);
#if defined(USE_ESP8266_LOGGER_SERIAL)
this->hw_serial_ = &Serial;
Serial.begin(this->baud_rate_);
if (this->uart_ == UART_SELECTION_UART0_SWAP) {
Serial.swap();
}
Serial.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
#elif defined(USE_ESP8266_LOGGER_SERIAL1)
this->hw_serial_ = &Serial1;
Serial1.begin(this->baud_rate_);
Serial1.setDebugOutput(ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE);
#else
// No serial logging - disable debug output
uart_set_debug(UART_NO);
#endif
global_logger = this;
@@ -39,15 +34,16 @@ void HOT Logger::write_msg_(const char *msg, size_t len) {
}
const LogString *Logger::get_uart_selection_() {
switch (this->uart_) {
case UART_SELECTION_UART0:
return LOG_STR("UART0");
case UART_SELECTION_UART1:
return LOG_STR("UART1");
case UART_SELECTION_UART0_SWAP:
default:
return LOG_STR("UART0_SWAP");
#if defined(USE_ESP8266_LOGGER_SERIAL)
if (this->uart_ == UART_SELECTION_UART0_SWAP) {
return LOG_STR("UART0_SWAP");
}
return LOG_STR("UART0");
#elif defined(USE_ESP8266_LOGGER_SERIAL1)
return LOG_STR("UART1");
#else
return LOG_STR("NONE");
#endif
}
} // namespace esphome::logger