summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorMasterPhi <[email protected]>2021-07-17 20:41:19 +0200
committerMasterPhi <[email protected]>2021-07-17 20:44:44 +0200
commitf52e1889c7f4bca23311a97b5869eab70c766094 (patch)
treecc719d8af81c94cfffc477f23e6b3b5977ae0980 /examples
parentbae0d3b7bbe5145017ebd08f777fe0b8063f44b7 (diff)
Fix merge error.
Diffstat (limited to 'examples')
-rw-r--r--examples/device/cdc_msc/src/msc_disk.c2
-rw-r--r--examples/device/hid_composite/src/tusb_config.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/device/cdc_msc/src/msc_disk.c b/examples/device/cdc_msc/src/msc_disk.c
index 3caf3fd42..503baace9 100644
--- 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
diff --git a/examples/device/hid_composite/src/tusb_config.h b/examples/device/hid_composite/src/tusb_config.h
index 31dea4ee9..868424e6d 100644
--- 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