Update TinyUSB

This commit is contained in:
me-no-dev
2020-05-30 14:06:28 +03:00
parent 8ac2a69553
commit f2e1016ea5
146 changed files with 12771 additions and 562 deletions

View File

@ -25,6 +25,8 @@
* [MSB] HID | MSC | CDC [LSB]
*/
#define EPNUM_MSC 0x03
#define EPNUM_VENDOR 0x06
#define EPNUM_MIDI 0x05
#ifdef __cplusplus
extern "C" {
@ -52,12 +54,21 @@ enum {
ITF_NUM_HID,
# endif
ITF_NUM_TOTAL
# if CFG_TUD_MIDI
ITF_NUM_MIDI,
ITF_NUM_MIDI_STREAMING,
# endif
# if CFG_TUD_VENDOR
ITF_NUM_VENDOR,
# endif
ITF_NUM_TOTAL
};
enum {
CONFIG_TOTAL_LEN = TUD_CONFIG_DESC_LEN + CFG_TUD_CDC * TUD_CDC_DESC_LEN + CFG_TUD_MSC * TUD_MSC_DESC_LEN +
CFG_TUD_HID * TUD_HID_DESC_LEN
CFG_TUD_HID * TUD_HID_DESC_LEN + CFG_TUD_VENDOR * TUD_VENDOR_DESC_LEN + CFG_TUD_MIDI * TUD_MIDI_DESC_LEN
};
bool tusb_desc_set;

View File

@ -20,7 +20,7 @@
#define USB_ESPRESSIF_VID 0x303A
#define USB_STRING_DESCRIPTOR_ARRAY_SIZE 7
#define USB_STRING_DESCRIPTOR_ARRAY_SIZE 9
typedef char *tusb_desc_strarray_device_t[USB_STRING_DESCRIPTOR_ARRAY_SIZE];
tusb_desc_device_t descriptor_tinyusb;

View File

@ -61,6 +61,13 @@ extern "C" {
# endif
# endif
# if CFG_TUD_VENDOR
# if (CFG_TUD_VENDOR_EPSIZE < 4)
# define CFG_TUD_VENDOR_EPSIZE 4
# warning "CFG_TUD_VENDOR_EPSIZE was too low and was set to 4"
# endif
# endif
# if CFG_TUD_CUSTOM_CLASS
# warning "Please check that the buffer is more then 4 bytes"
# endif

View File

@ -89,6 +89,10 @@ extern "C" {
# define CONFIG_USB_CUSTOM_CLASS_ENABLED 0
#endif
#ifndef CONFIG_USB_VENDOR_ENABLED
# define CONFIG_USB_VENDOR_ENABLED 0
#endif
//------------- CLASS -------------//
#define CFG_TUD_CDC CONFIG_USB_CDC_ENABLED
#define CFG_TUD_MSC CONFIG_USB_MSC_ENABLED
@ -97,7 +101,7 @@ extern "C" {
#define CFG_TUD_MIDI CONFIG_USB_MIDI_ENABLED
#define CFG_TUD_CUSTOM_CLASS CONFIG_USB_CUSTOM_CLASS_ENABLED
#define CFG_TUD_VENDOR CONFIG_USB_VENDOR_ENABLED
// CDC FIFO size of TX and RX
#define CFG_TUD_CDC_RX_BUFSIZE CONFIG_USB_CDC_RX_BUFSIZE
@ -109,6 +113,13 @@ extern "C" {
// HID buffer size Should be sufficient to hold ID (if any) + Data
#define CFG_TUD_HID_BUFSIZE CONFIG_USB_HID_BUFSIZE
// VENDOR FIFO size of TX and RX
#define CFG_TUD_VENDOR_RX_BUFSIZE 64
#define CFG_TUD_VENDOR_TX_BUFSIZE 64
// MIDI FIFO size of TX and RX
#define CFG_TUD_MIDI_RX_BUFSIZE CONFIG_USB_MIDI_RX_BUFSIZE
#define CFG_TUD_MIDI_TX_BUFSIZE CONFIG_USB_MIDI_TX_BUFSIZE
#ifdef __cplusplus
}
#endif