diff options
| author | hathach <[email protected]> | 2019-07-22 19:06:59 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-07-22 19:06:59 +0700 |
| commit | 4dc24211a2640d4af7fbbbe82d19afb4e9c5826f (patch) | |
| tree | 593bc9539777049432b1470ba82a89b7318c3fe0 /examples/device | |
| parent | ed6fa460e9a885bb84a6f1588763ea5fb3f4df49 (diff) | |
| parent | 97e2629d647584681b2883f2081fa2cddb3d61cc (diff) | |
Merge pull request #87 from hathach/add-stm32f411disco
Add stm32f411disco board
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject | 8 | ||||
| -rw-r--r-- | examples/device/midi_test/src/usb_descriptors.c | 11 | ||||
| -rw-r--r-- | examples/device/msc_dual_lun/src/usb_descriptors.c | 11 |
3 files changed, 18 insertions, 12 deletions
diff --git a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject index 83067fd09..6f6690d21 100644 --- a/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject +++ b/examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject @@ -61,8 +61,8 @@ recurse="No" /> <folder Name="hw"> <folder Name="bsp"> - <folder Name="stm32f407g_disc1"> - <file file_name="../../../../../hw/bsp/stm32f407g_disc1/board_stm32f407g_disc1.c" /> + <folder Name="stm32f407disco"> + <file file_name="../../../../../hw/bsp/stm32f407disco/board_stm32f407disco.c" /> </folder> <file file_name="../../../../../hw/bsp/board.h" /> </folder> @@ -76,11 +76,11 @@ </folder> </folder> <configuration - Name="stm32f407g_disc1" + Name="stm32f407disco" c_preprocessor_definitions="BOARD_STM32F407G_DISC1" /> </project> <configuration - Name="stm32f407g_disc1" + Name="stm32f407disco" c_preprocessor_definitions="DEBUG" gcc_debugging_level="Level 3" gcc_optimization_level="None" /> diff --git a/examples/device/midi_test/src/usb_descriptors.c b/examples/device/midi_test/src/usb_descriptors.c index 192dacfbe..3eef02bb2 100644 --- a/examples/device/midi_test/src/usb_descriptors.c +++ b/examples/device/midi_test/src/usb_descriptors.c @@ -71,10 +71,13 @@ enum CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + TUD_MIDI_DESC_LEN }; -// Use Endpoint 2 instead of 1 due to NXP MCU -// LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number -// 0 control, 1 In, 2 Bulk, 3 Iso, 4 In etc ... -#define EPNUM_MIDI 0x02 +#if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX + // LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number + // 0 control, 1 In, 2 Bulk, 3 Iso, 4 In etc ... + #define EPNUM_MIDI 0x02 +#else + #define EPNUM_MIDI 0x01 +#endif uint8_t const desc_configuration[] = { diff --git a/examples/device/msc_dual_lun/src/usb_descriptors.c b/examples/device/msc_dual_lun/src/usb_descriptors.c index 26ebe190c..1a71b7fcc 100644 --- a/examples/device/msc_dual_lun/src/usb_descriptors.c +++ b/examples/device/msc_dual_lun/src/usb_descriptors.c @@ -68,10 +68,13 @@ enum CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + TUD_MSC_DESC_LEN }; -// Use Endpoint 2 instead of 1 due to NXP MCU -// LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number -// 0 control, 1 In, 2 Bulk, 3 Iso, 4 In etc ... -#define EPNUM_MSC 0x02 +#if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX + // LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number + // 0 control, 1 In, 2 Bulk, 3 Iso, 4 In etc ... + #define EPNUM_MSC 0x02 +#else + #define EPNUM_MSC 0x01 +#endif uint8_t const desc_configuration[] = { |