From f1e284bcab01fbd1e7afebacbaf9a1bd2e06516c Mon Sep 17 00:00:00 2001
From: Tomasz Duda <tomaszduda23@gmail.com>
Date: Fri, 2 Feb 2024 23:22:27 +0100
Subject: [PATCH] generate config in python

---
 esphome/components/logger/__init__.py |  4 ++++
 esphome/components/logger/logger.h    | 17 +++++------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index fd64c65c77..2b3e8289f3 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -274,6 +274,10 @@ async def to_code(config):
             add_idf_sdkconfig_option("CONFIG_ESP_CONSOLE_USB_CDC", True)
         elif config[CONF_HARDWARE_UART] == USB_SERIAL_JTAG:
             add_idf_sdkconfig_option("CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG", True)
+    if config[CONF_HARDWARE_UART] == USB_SERIAL_JTAG:
+        cg.add_build_flag("-DUSE_USB_SERIAL_JTAG")
+    elif config[CONF_HARDWARE_UART] == USB_CDC:
+        cg.add_build_flag("-DUSE_USB_CDC")
 
     # Register at end for safe mode
     await cg.register_component(log, config)
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 49bb072e01..f8c1070a0f 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -39,28 +39,21 @@ enum UARTSelection {
 #else
   UART_SELECTION_UART0 = 0,
   UART_SELECTION_UART1,
-#if defined(USE_ESP32)
 #if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
     !defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3) && !defined(USE_ESP32_VARIANT_ESP32H2)
   UART_SELECTION_UART2,
 #endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32C6 && !USE_ESP32_VARIANT_ESP32S2 &&
         // !USE_ESP32_VARIANT_ESP32S3 && !USE_ESP32_VARIANT_ESP32H2
-#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \
-    (defined(USE_ESP32_VARIANT_ESP32C3) && defined(USE_ARDUINO))
+#ifdef USE_USB_CDC
   UART_SELECTION_USB_CDC,
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32C3
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
-    defined(USE_ESP32_VARIANT_ESP32H2)
+#endif
+#ifdef USE_USB_SERIAL_JTAG
   UART_SELECTION_USB_SERIAL_JTAG,
-#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C6 || USE_ESP32_VARIANT_ESP32S3 ||
-        // USE_ESP32_VARIANT_ESP32H2
-#endif  // USE_ESP32
+#endif
 #ifdef USE_ESP8266
   UART_SELECTION_UART0_SWAP,
 #endif  // USE_ESP8266
-#ifdef USE_RP2040
-  UART_SELECTION_USB_CDC,
-#endif  // USE_RP2040
+
 #endif  // USE_LIBRETINY
 };
 #endif  // USE_ESP32 || USE_ESP8266 || USE_RP2040 || USE_LIBRETINY