Merge branch 'master' into portability
This commit is contained in:
@@ -26,4 +26,4 @@ target_include_directories(${PROJECT} PUBLIC
|
||||
|
||||
# Configure compilation flags and libraries for the example... see the corresponding function
|
||||
# in hw/bsp/FAMILY/family.cmake for details.
|
||||
family_configure_device_example(${PROJECT})
|
||||
family_configure_device_example(${PROJECT})
|
||||
|
@@ -1,4 +1,3 @@
|
||||
include ../../../tools/top.mk
|
||||
include ../../make.mk
|
||||
|
||||
INC += \
|
||||
|
@@ -1 +1 @@
|
||||
mcu:SAMD11
|
||||
mcu:SAMD11
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2019 Ha Thach (tinyusb.org)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2019 Ha Thach (tinyusb.org)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/*
|
||||
/*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2019 Ha Thach (tinyusb.org)
|
||||
@@ -145,6 +145,19 @@ enum
|
||||
#define EPNUM_1_MSC_OUT 0x01
|
||||
#define EPNUM_1_MSC_IN 0x82
|
||||
|
||||
#elif CFG_TUSB_MCU == OPT_MCU_FT90X || CFG_TUSB_MCU == OPT_MCU_FT93X
|
||||
// FT9XX doesn't support a same endpoint number with different direction IN and OUT
|
||||
// e.g EP1 OUT & EP1 IN cannot exist together
|
||||
#define EPNUM_0_CDC_NOTIF 0x81
|
||||
#define EPNUM_0_CDC_OUT 0x02
|
||||
#define EPNUM_0_CDC_IN 0x83
|
||||
|
||||
#define EPNUM_0_MIDI_OUT 0x04
|
||||
#define EPNUM_0_MIDI_IN 0x85
|
||||
|
||||
#define EPNUM_1_MSC_OUT 0x01
|
||||
#define EPNUM_1_MSC_IN 0x82
|
||||
|
||||
#else
|
||||
#define EPNUM_0_CDC_NOTIF 0x81
|
||||
#define EPNUM_0_CDC_OUT 0x02
|
||||
|
Reference in New Issue
Block a user