diff options
| author | hathach <[email protected]> | 2020-03-17 10:24:37 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2020-03-17 10:24:37 +0700 |
| commit | f8d6bbe43b788031f4fbd2986e9f6cd8911ba19d (patch) | |
| tree | 135e39b5f315c49728350050b56dcaa3456d8704 /examples/device | |
| parent | 45e32a787bab61c61ad4a32f6c59d74f9d8aa4cd (diff) | |
| parent | e47f9921570c75afd3288407601897c5b283f043 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/board_test/src/main.c | 2 | ||||
| -rw-r--r-- | examples/device/net_lwip_webserver/src/tusb_config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/device/board_test/src/main.c b/examples/device/board_test/src/main.c index 865821745..584ff799d 100644 --- a/examples/device/board_test/src/main.c +++ b/examples/device/board_test/src/main.c @@ -42,7 +42,7 @@ enum { BLINK_UNPRESSED = 1000 }; -#define HELLO_STR "Hello from TinyUSB\n" +#define HELLO_STR "Hello from TinyUSB\r\n" int main(void) { diff --git a/examples/device/net_lwip_webserver/src/tusb_config.h b/examples/device/net_lwip_webserver/src/tusb_config.h index 329fc80b9..0b40fefab 100644 --- a/examples/device/net_lwip_webserver/src/tusb_config.h +++ b/examples/device/net_lwip_webserver/src/tusb_config.h @@ -39,7 +39,7 @@ #error CFG_TUSB_MCU must be defined #endif -#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX +#if CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || CFG_TUSB_MCU == OPT_MCU_NUC505 #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | OPT_MODE_HIGH_SPEED) #else #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE |