Merge branch 'pr2340' into dev

src/main.cpp

@@ -43,10 +43,8 @@ void setup()
 
     // Initialize serial output
     Serial.begin(SERIAL_BAUDRATE);
-#if ARDUINO_USB_CDC_ON_BOOT
+#if !ARDUINO_USB_CDC_ON_BOOT
-    Serial.setTxTimeoutMs(0);
+    // Only wait for serial interface to be set up when not using CDC
-    delay(100);
-#else
     while (!Serial)
         yield();
 #endif