1
0
mirror of https://github.com/esphome/esphome.git synced 2025-09-17 18:52:19 +01:00

Merge branch 'integration' into memory_api

This commit is contained in:
J. Nick Koston
2025-09-05 13:36:33 -05:00
2 changed files with 8 additions and 2 deletions

View File

@@ -35,9 +35,12 @@ const LogString *Logger::get_uart_selection_() {
return LOG_STR("UART0"); return LOG_STR("UART0");
case UART_SELECTION_UART1: case UART_SELECTION_UART1:
return LOG_STR("UART1"); return LOG_STR("UART1");
#ifdef USE_LOGGER_USB_CDC
case UART_SELECTION_USB_CDC: case UART_SELECTION_USB_CDC:
default:
return LOG_STR("USB_CDC"); return LOG_STR("USB_CDC");
#endif
default:
return LOG_STR("UNKNOWN");
} }
} }

View File

@@ -83,9 +83,12 @@ const LogString *Logger::get_uart_selection_() {
return LOG_STR("UART0"); return LOG_STR("UART0");
case UART_SELECTION_UART1: case UART_SELECTION_UART1:
return LOG_STR("UART1"); return LOG_STR("UART1");
#ifdef USE_LOGGER_USB_CDC
case UART_SELECTION_USB_CDC: case UART_SELECTION_USB_CDC:
default:
return LOG_STR("USB_CDC"); return LOG_STR("USB_CDC");
#endif
default:
return LOG_STR("UNKNOWN");
} }
} }