Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-27 20:53:46 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[logger] Fix UART selection not applied before pre_setup() (#14690)

Browse Source
This commit is contained in:
Keith Burzinski
2026-03-10 23:31:27 -05:00
committed by GitHub
parent 6561c9bc95
commit d0f37ae694
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/logger/__init__.py
+10 -6
View File
@@ -337,6 +337,16 @@ async def to_code(config):
) )
if CORE.is_esp32: if CORE.is_esp32:
cg.add(log.create_pthread_key()) cg.add(log.create_pthread_key())
# set_uart_selection() must be called before pre_setup() because
# pre_setup() switches on uart_ to decide which hardware to initialize
# (e.g. UART0 vs USB_SERIAL_JTAG). Without this, uart_ is still the
# default UART_SELECTION_UART0 and the wrong hardware gets initialized.
if CONF_HARDWARE_UART in config:
cg.add(
log.set_uart_selection(
HARDWARE_UART_TO_UART_SELECTION[config[CONF_HARDWARE_UART]]
)
)
# pre_setup() must be called before init_log_buffer() because # pre_setup() must be called before init_log_buffer() because
# init_log_buffer() calls disable_loop() which may log at VV level, # init_log_buffer() calls disable_loop() which may log at VV level,
# and global_logger must be set before any logging occurs. # and global_logger must be set before any logging occurs.
@@ -354,12 +364,6 @@ async def to_code(config):
cg.add(log.init_log_buffer(64)) # Fixed 64 slots for host cg.add(log.init_log_buffer(64)) # Fixed 64 slots for host
cg.add(log.set_log_level(initial_level)) cg.add(log.set_log_level(initial_level))
if CONF_HARDWARE_UART in config:
cg.add(
log.set_uart_selection(
HARDWARE_UART_TO_UART_SELECTION[config[CONF_HARDWARE_UART]]
)
)
# Enable runtime tag levels if logs are configured or explicitly enabled # Enable runtime tag levels if logs are configured or explicitly enabled
logs_config = config[CONF_LOGS] logs_config = config[CONF_LOGS]