jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
hathach
2019-07-22 19:23:48 +07:00
parent 33de35504a b041b23ba3
commit 8fad8fb5c2
19 changed files with 1431 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/device/cdc_msc_hid/ses/stm32f4/stm32f4.emProject
+4 -4
View File
@@ -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" />
examples/device/midi_test/src/usb_descriptors.c
+7 -4
View File
@@ -79,10 +79,13 @@ enum
#define 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[] =
{
examples/device/msc_dual_lun/src/usb_descriptors.c
+7 -4
View File
@@ -77,10 +77,13 @@ enum
#define 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[] =
{