diff options
| author | Ha Thach <[email protected]> | 2020-03-24 12:16:15 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-24 12:16:15 +0700 |
| commit | 9a48e98fadaf69a8637c5586d730754230eb68a9 (patch) | |
| tree | c087e78655aa7ff789b39df0435e9b86a8eae448 /examples/device | |
| parent | fca4a6eabf0f2de5003700deb9df0871565cf32a (diff) | |
| parent | 27ec8451a4104bdf03505c8bbd6d59d89e60273b (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/board_test/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx | 0 | ||||
| -rw-r--r-- | examples/device/dfu_rt/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx | 1 | ||||
| -rw-r--r-- | examples/device/net_lwip_webserver/Makefile | 2 | ||||
| -rw-r--r-- | examples/device/usbtmc/src/tusb_config.h | 2 |
6 files changed, 9 insertions, 0 deletions
diff --git a/examples/device/board_test/src/tusb_config.h b/examples/device/board_test/src/tusb_config.h index 2f2a4deeb..1a52cc348 100644 --- a/examples/device/board_test/src/tusb_config.h +++ b/examples/device/board_test/src/tusb_config.h @@ -64,7 +64,9 @@ // DEVICE CONFIGURATION //-------------------------------------------------------------------- +#ifndef CFG_TUD_ENDPOINT0_SIZE #define CFG_TUD_ENDPOINT0_SIZE 64 +#endif //------------- CLASS -------------// #define CFG_TUD_CDC 0 diff --git a/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx b/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/examples/device/cdc_msc_freertos/.skip.MCU_MSP430x5xx diff --git a/examples/device/dfu_rt/src/tusb_config.h b/examples/device/dfu_rt/src/tusb_config.h index 96c3a2468..d1efcdab5 100644 --- a/examples/device/dfu_rt/src/tusb_config.h +++ b/examples/device/dfu_rt/src/tusb_config.h @@ -51,7 +51,9 @@ // DEVICE CONFIGURATION //-------------------------------------------------------------------- +#ifndef CFG_TUD_ENDPOINT0_SIZE #define CFG_TUD_ENDPOINT0_SIZE 64 +#endif //------------- CLASS -------------// diff --git a/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx b/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx new file mode 100644 index 000000000..17600f062 --- /dev/null +++ b/examples/device/net_lwip_webserver/.skip.MCU_MSP430x5xx @@ -0,0 +1 @@ +too many warnings for 16-bit integer overflow diff --git a/examples/device/net_lwip_webserver/Makefile b/examples/device/net_lwip_webserver/Makefile index a153c30be..fa93cf87f 100644 --- a/examples/device/net_lwip_webserver/Makefile +++ b/examples/device/net_lwip_webserver/Makefile @@ -17,6 +17,8 @@ INC += \ # Example source EXAMPLE_SOURCE += $(wildcard src/*.c) SRC_C += $(addprefix $(CURRENT_PATH)/, $(EXAMPLE_SOURCE)) + +# lwip sources SRC_C += \ lib/lwip/src/core/altcp.c \ lib/lwip/src/core/altcp_alloc.c \ diff --git a/examples/device/usbtmc/src/tusb_config.h b/examples/device/usbtmc/src/tusb_config.h index 5dddc2c46..b6a40355e 100644 --- a/examples/device/usbtmc/src/tusb_config.h +++ b/examples/device/usbtmc/src/tusb_config.h @@ -51,7 +51,9 @@ // DEVICE CONFIGURATION //-------------------------------------------------------------------- +#ifndef CFG_TUD_ENDPOINT0_SIZE #define CFG_TUD_ENDPOINT0_SIZE 64 +#endif //------------- CLASS -------------// |