Fix merge error.

2021-07-17 20:41:19 +02:00
parent bae0d3b7bb
commit f52e1889c7
4 changed files with 2 additions and 34 deletions
--- a/examples/device/cdc_msc/src/msc_disk.c
+++ b/examples/device/cdc_msc/src/msc_disk.c
@@ -23,7 +23,7 @@
 *
 */

-//#include "bsp/board.h"
+#include "bsp/board.h"
 #include "tusb.h"

 #if CFG_TUD_MSC
--- a/examples/device/hid_composite/src/tusb_config.h
+++ b/examples/device/hid_composite/src/tusb_config.h
@@ -69,7 +69,7 @@
 #endif

 // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
-#define CFG_TUSB_DEBUG           0
+// #define CFG_TUSB_DEBUG           0

 /* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
 * Tinyusb use follows macros to declare transferring memory so that they can be put