Merge remote-tracking branch 'origin/ac_main' into mdev

2022-12-24 15:27:43 +01:00
parent 5c161db062 0e236f9d88
commit d1bf3b4690
10 changed files with 2100 additions and 2075 deletions
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -276,6 +276,10 @@ void WLED::setup()
  #endif

  Serial.begin(115200);
+  #if !ARDUINO_USB_CDC_ON_BOOT
+  Serial.setTimeout(50);  // this causes troubles on new MCUs that have a "virtual" USB Serial (HWCDC)
+  #else
+  #endif
  #if defined(WLED_DEBUG) && defined(ARDUINO_ARCH_ESP32) && (defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3) || ARDUINO_USB_CDC_ON_BOOT)
  delay(2500);  // allow CDC USB serial to initialise
  #endif