Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-01 03:04:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' into dev

Browse source
This commit is contained in:
CptSkippy 2024-06-07 08:47:05 -07:00 committed by GitHub
commit d1e5719ec6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
esphome/components/logger/__init__.py
View file

@ -112,11 +112,18 @@ HARDWARE_UART_TO_UART_SELECTION = {
} }
HARDWARE_UART_TO_SERIAL = { HARDWARE_UART_TO_SERIAL = {
UART0: cg.global_ns.Serial, PLATFORM_ESP8266: {
UART0_SWAP: cg.global_ns.Serial, UART0: cg.global_ns.Serial,
UART1: cg.global_ns.Serial1, UART0_SWAP: cg.global_ns.Serial,
UART2: cg.global_ns.Serial2, UART1: cg.global_ns.Serial1,
DEFAULT: cg.global_ns.Serial, UART2: cg.global_ns.Serial2,
DEFAULT: cg.global_ns.Serial,
},
PLATFORM_RP2040: {
UART0: cg.global_ns.Serial1,
UART1: cg.global_ns.Serial2,
USB_CDC: cg.global_ns.Serial,
},
} }
is_log_level = cv.one_of(*LOG_LEVELS, upper=True) is_log_level = cv.one_of(*LOG_LEVELS, upper=True)
@ -244,8 +251,14 @@ async def to_code(config):
is_at_least_very_verbose = this_severity >= very_verbose_severity is_at_least_very_verbose = this_severity >= very_verbose_severity
has_serial_logging = baud_rate != 0 has_serial_logging = baud_rate != 0
if CORE.is_esp8266 and has_serial_logging and is_at_least_verbose: if (
debug_serial_port = HARDWARE_UART_TO_SERIAL[config.get(CONF_HARDWARE_UART)] (CORE.is_esp8266 or CORE.is_rp2040)
and has_serial_logging
and is_at_least_verbose
):
debug_serial_port = HARDWARE_UART_TO_SERIAL[CORE.target_platform][
config.get(CONF_HARDWARE_UART)
]
cg.add_build_flag(f"-DDEBUG_ESP_PORT={debug_serial_port}") cg.add_build_flag(f"-DDEBUG_ESP_PORT={debug_serial_port}")
cg.add_build_flag("-DLWIP_DEBUG") cg.add_build_flag("-DLWIP_DEBUG")
DEBUG_COMPONENTS = { DEBUG_COMPONENTS = {

9
esphome/core/defines.h
View file

@ -101,6 +101,14 @@
#ifdef USE_ESP_IDF #ifdef USE_ESP_IDF
#define USE_ESP_IDF_VERSION_CODE VERSION_CODE(4, 4, 2) #define USE_ESP_IDF_VERSION_CODE VERSION_CODE(4, 4, 2)
#endif #endif
#if defined(USE_ESP32_VARIANT_ESP32S2)
#define USE_LOGGER_USB_CDC
#elif defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C3) || \
defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32H2)
#define USE_LOGGER_USB_CDC
#define USE_LOGGER_USB_SERIAL_JTAG
#endif
#endif #endif
// ESP8266-specific feature flags // ESP8266-specific feature flags
@ -123,6 +131,7 @@
#ifdef USE_RP2040 #ifdef USE_RP2040
#define USE_ARDUINO_VERSION_CODE VERSION_CODE(3, 3, 0) #define USE_ARDUINO_VERSION_CODE VERSION_CODE(3, 3, 0)
#define USE_LOGGER_USB_CDC
#define USE_SOCKET_IMPL_LWIP_TCP #define USE_SOCKET_IMPL_LWIP_TCP
#define USE_SPI #define USE_SPI
#endif #endif