unify debuging CFG_TUSB_DEBUG with Serial1 using serial1_printf()

Author: hathach

src/arduino/Adafruit_TinyUSB_API.cpp

@@ -28,6 +28,7 @@
 #if CFG_TUD_ENABLED && !defined(ARDUINO_ARCH_ESP32)
 
 #include "Adafruit_TinyUSB.h"
+#include "Arduino.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
@@ -54,6 +55,26 @@ void TinyUSB_Device_FlushCDC(void) {
   }
 }
 
+// Debug log with Serial1
+#if CFG_TUSB_DEBUG && defined(CFG_TUSB_DEBUG_PRINTF)
+int CFG_TUSB_DEBUG_PRINTF(const char *__restrict format, ...) {
+  static bool ser1_inited = false;
+  if (!ser1_inited) {
+    ser1_inited = true;
+    Serial1.begin(115200);
+  }
+
+  char buf[256];
+  int len;
+  va_list ap;
+  va_start(ap, format);
+  len = vsnprintf(buf, sizeof(buf), format, ap);
+  Serial1.write(buf);
+  va_end(ap);
+  return len;
+}
+#endif
+
 } // extern C
 
 #endif

src/arduino/ports/rp2040/Adafruit_TinyUSB_rp2040.cpp

@@ -138,20 +138,6 @@ void TinyUSB_Device_Task(void) {
     mutex_exit(&__usb_mutex);
   }
 }
-
-// Debug log with Serial1
-#if CFG_TUSB_DEBUG
-int serial1_printf(const char *__restrict format, ...) {
-  char buf[256];
-  int len;
-  va_list ap;
-  va_start(ap, format);
-  len = vsnprintf(buf, sizeof(buf), format, ap);
-  Serial1.write(buf);
-  va_end(ap);
-  return len;
-}
-#endif
 }
 
 #endif

src/arduino/ports/rp2040/tusb_config_rp2040.h

@@ -52,11 +52,6 @@ extern "C" {
 #define CFG_TUSB_DEBUG 0
 #endif
 
-#if CFG_TUSB_DEBUG
-#define CFG_TUSB_DEBUG_PRINTF serial1_printf
-extern int serial1_printf(const char *__restrict __format, ...);
-#endif
-
 #define CFG_TUSB_MEM_SECTION
 #define CFG_TUSB_MEM_ALIGN TU_ATTR_ALIGNED(4)
 

src/arduino/ports/samd/Adafruit_TinyUSB_samd.cpp

@@ -52,20 +52,6 @@ void USB_Handler(void) { tud_int_handler(0); }
 
 #endif
 
-// Debug log with Serial1
-#if CFG_TUSB_DEBUG
-int serial1_printf(const char *__restrict format, ...) {
-  char buf[256];
-  int len;
-  va_list ap;
-  va_start(ap, format);
-  len = vsnprintf(buf, sizeof(buf), format, ap);
-  Serial1.write(buf);
-  va_end(ap);
-  return len;
-}
-#endif
-
 } // extern C
 
 //--------------------------------------------------------------------+

src/arduino/ports/samd/tusb_config_samd.h

@@ -46,9 +46,8 @@ extern "C" {
 
 #define CFG_TUSB_OS OPT_OS_NONE
 
+#ifndef CFG_TUSB_DEBUG
 #define CFG_TUSB_DEBUG 0
-#if CFG_TUSB_DEBUG
-#define CFG_TUSB_DEBUG_PRINTF serial1_printf
 #endif
 
 #define CFG_TUSB_MEM_SECTION

src/tusb_config.h

@@ -46,6 +46,11 @@
   #error TinyUSB Arduino Library does not support your core yet
 #endif
 
+// Debug TinyUSB with Serial1
+#if CFG_TUSB_DEBUG
+#define CFG_TUSB_DEBUG_PRINTF serial1_printf
+#endif
+
 #ifdef __cplusplus
  }
 #endif