espressif
diff --git a/‎cores/esp32/HWCDC.cpp
Copy file name to clipboardExpand all lines: cores/esp32/HWCDC.cpp
+1Lines changed: 1 addition & 0 deletions b/‎cores/esp32/HWCDC.cpp
Copy file name to clipboardExpand all lines: cores/esp32/HWCDC.cpp
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎cores/esp32/USBCDC.cpp
Copy file name to clipboardExpand all lines: cores/esp32/USBCDC.cpp
+1Lines changed: 1 addition & 0 deletions b/‎cores/esp32/USBCDC.cpp
Copy file name to clipboardExpand all lines: cores/esp32/USBCDC.cpp
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎cores/esp32/esp32-hal-uart.c
Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-uart.c
+1-9Lines changed: 1 addition & 9 deletions b/‎cores/esp32/esp32-hal-uart.c
Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-uart.c
+1-9Lines changed: 1 addition & 9 deletions
@@ -603,6 +603,7 @@ void HWCDC::setDebugOutput(bool en) {
   } else {
     ets_install_putc2(NULL);
   }
+  ets_install_putc1(NULL);  // closes UART log output
 }
 
 #if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT  // Hardware JTAG CDC selected
 
@@ -455,6 +455,7 @@ void USBCDC::setDebugOutput(bool en) {
   } else {
     ets_install_putc2(NULL);
   }
+  ets_install_putc1(NULL);  // closes UART log output
 }
 
 USBCDC::operator bool() const {
 
@@ -1186,24 +1186,16 @@ int log_printfv(const char *format, va_list arg) {
       return 0;
     }
   }
-/*
+  /*
 // This causes dead locks with logging in specific cases and also with C++ constructors that may send logs
 #if !CONFIG_DISABLE_HAL_LOCKS
     if(s_uart_debug_nr != -1 && _uart_bus_array[s_uart_debug_nr].lock){
         xSemaphoreTake(_uart_bus_array[s_uart_debug_nr].lock, portMAX_DELAY);
     }
 #endif
 */
-#if (ARDUINO_USB_CDC_ON_BOOT == 1 && ARDUINO_USB_MODE == 0) || CONFIG_IDF_TARGET_ESP32C3 \
-  || ((CONFIG_IDF_TARGET_ESP32H2 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32P4) && ARDUINO_USB_CDC_ON_BOOT == 1)
   vsnprintf(temp, len + 1, format, arg);
   ets_printf("%s", temp);
-#else
-  int wlen = vsnprintf(temp, len + 1, format, arg);
-  for (int i = 0; i < wlen; i++) {
-    ets_write_char_uart(temp[i]);
-  }
-#endif
   /*
 // This causes dead locks with logging and also with constructors that may send logs
 #if !CONFIG_DISABLE_HAL_LOCKS
Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,7 @@ void HWCDC::setDebugOutput(bool en) {`
`603`	`603`	`} else {`
`604`	`604`	`ets_install_putc2(NULL);`
`605`	`605`	`}`
	`606`	`+ ets_install_putc1(NULL); // closes UART log output`
`606`	`607`	`}`
`607`	`608`
`608`	`609`	`#if ARDUINO_USB_MODE && ARDUINO_USB_CDC_ON_BOOT // Hardware JTAG CDC selected`
Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,7 @@ void USBCDC::setDebugOutput(bool en) {`
`455`	`455`	`} else {`
`456`	`456`	`ets_install_putc2(NULL);`
`457`	`457`	`}`
	`458`	`+ ets_install_putc1(NULL); // closes UART log output`
`458`	`459`	`}`
`459`	`460`
`460`	`461`	`USBCDC::operator bool() const {`