fix(build): fix example build with tinyusb_0_17_0

Author: lijunru-hub

components/usb/usb_device_uvc/idf_component.yml

@@ -13,7 +13,8 @@ issues: https://github.com/espressif/esp-iot-solution/issues
 dependencies:
   idf: ">=5.0"
   espressif/tinyusb:
-    version: ">=0.15.0~10"
+    # Pinned to version 0.15.0~10 until https://github.com/espressif/tinyusb/pull/36 is merged.
+    version: "0.15.0~10"
   cmake_utilities: "*"
 examples:
   - path: ../../../examples/usb/device/usb_webcam

examples/keyboard/hid_device/usb_descriptors.h

@@ -94,45 +94,6 @@ enum {
       HID_INPUT        ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE )  ,\
   HID_COLLECTION_END \
 
-#define HID_USAGE_PAGE_LIGHTING_AND_ILLUMINATION 0x59
-
-/// HID Usage Table - Lighting And Illumination Page (0x59)
-enum {
-    HID_USAGE_LIGHTING_LAMP_ARRAY                          = 0x01,
-    HID_USAGE_LIGHTING_LAMP_ARRAY_ATTRIBUTES_REPORT        = 0x02,
-    HID_USAGE_LIGHTING_LAMP_COUNT                          = 0x03,
-    HID_USAGE_LIGHTING_BOUNDING_BOX_WIDTH_IN_MICROMETERS   = 0x04,
-    HID_USAGE_LIGHTING_BOUNDING_BOX_HEIGHT_IN_MICROMETERS  = 0x05,
-    HID_USAGE_LIGHTING_BOUNDING_BOX_DEPTH_IN_MICROMETERS   = 0x06,
-    HID_USAGE_LIGHTING_LAMP_ARRAY_KIND                     = 0x07,
-    HID_USAGE_LIGHTING_MIN_UPDATE_INTERVAL_IN_MICROSECONDS = 0x08,
-    HID_USAGE_LIGHTING_LAMP_ATTRIBUTES_REQUEST_REPORT      = 0x20,
-    HID_USAGE_LIGHTING_LAMP_ID                             = 0x21,
-    HID_USAGE_LIGHTING_LAMP_ATTRIBUTES_RESPONSE_REPORT     = 0x22,
-    HID_USAGE_LIGHTING_POSITION_X_IN_MICROMETERS           = 0x23,
-    HID_USAGE_LIGHTING_POSITION_Y_IN_MICROMETERS           = 0x24,
-    HID_USAGE_LIGHTING_POSITION_Z_IN_MICROMETERS           = 0x25,
-    HID_USAGE_LIGHTING_LAMP_PURPOSES                       = 0x26,
-    HID_USAGE_LIGHTING_UPDATE_LATENCY_IN_MICROSECONDS      = 0x27,
-    HID_USAGE_LIGHTING_RED_LEVEL_COUNT                     = 0x28,
-    HID_USAGE_LIGHTING_GREEN_LEVEL_COUNT                   = 0x29,
-    HID_USAGE_LIGHTING_BLUE_LEVEL_COUNT                    = 0x2A,
-    HID_USAGE_LIGHTING_INTENSITY_LEVEL_COUNT               = 0x2B,
-    HID_USAGE_LIGHTING_IS_PROGRAMMABLE                     = 0x2C,
-    HID_USAGE_LIGHTING_INPUT_BINDING                       = 0x2D,
-    HID_USAGE_LIGHTING_LAMP_MULTI_UPDATE_REPORT            = 0x50,
-    HID_USAGE_LIGHTING_RED_UPDATE_CHANNEL                  = 0x51,
-    HID_USAGE_LIGHTING_GREEN_UPDATE_CHANNEL                = 0x52,
-    HID_USAGE_LIGHTING_BLUE_UPDATE_CHANNEL                 = 0x53,
-    HID_USAGE_LIGHTING_INTENSITY_UPDATE_CHANNEL            = 0x54,
-    HID_USAGE_LIGHTING_LAMP_UPDATE_FLAGS                   = 0x55,
-    HID_USAGE_LIGHTING_LAMP_RANGE_UPDATE_REPORT            = 0x60,
-    HID_USAGE_LIGHTING_LAMP_ID_START                       = 0x61,
-    HID_USAGE_LIGHTING_LAMP_ID_END                         = 0x62,
-    HID_USAGE_LIGHTING_LAMP_ARRAY_CONTROL_REPORT           = 0x70,
-    HID_USAGE_LIGHTING_AUTONOMOUS_MODE                     = 0x71,
-};
-
 // HID Lighting and Illumination Report Descriptor Template
 // - 1st parameter is report id (required)
 //   Creates 6 report ids for lighting HID usages in the following order:

examples/usb/host/usb_cdc_basic/main/idf_component.yml

@@ -1,6 +1,3 @@
-targets:
-  - esp32s2
-  - esp32s3
 dependencies:
   idf: ">=4.4.1"
   iot_usbh_cdc:

examples/usb/host/usb_cdc_basic/main/usb_cdc_basic_main.c

@@ -21,7 +21,7 @@ static const char *TAG = "cdc_basic_demo";
 #define OUT_RINGBUF_SIZE (1024 * 1)
 
 /* enable interface num */
-#define EXAMPLE_BULK_ITF_NUM 0
+#define EXAMPLE_BULK_ITF_NUM 1
 
 /* choose if use user endpoint descriptors */
 #define EXAMPLE_CONFIG_USER_EP_DESC
@@ -33,7 +33,7 @@ static void usb_receive_task(void *param)
     uint8_t buf[IN_RINGBUF_SIZE];
 
     while (1) {
-        for (size_t i = 0; i <= EXAMPLE_BULK_ITF_NUM; i++) {
+        for (size_t i = 0; i < EXAMPLE_BULK_ITF_NUM; i++) {
             /* Polling USB receive buffer to get data */
             usbh_cdc_get_rx_buffer_size(handle[i], &data_len);
             if (data_len > 0) {
@@ -91,7 +91,7 @@ void app_main(void)
 
     usbh_cdc_create(&dev_config, &handle[0]);
 
-#if (EXAMPLE_BULK_ITF_NUM > 0)
+#if (EXAMPLE_BULK_ITF_NUM > 1)
     config.itf_num = 1;
     config.cbs = {0};
     ESP_LOGI(TAG, "Open interface num: %d with first USB CDC Device", config.itf_num);

examples/usb/otg/usb_host_device_mode_manual_switch/cdc_device/tusb_config.h

@@ -107,7 +107,7 @@ extern "C" {
 // CDC FIFO size of TX and RX
 #define CFG_TUD_CDC_RX_BUFSIZE      512
 #define CFG_TUD_CDC_TX_BUFSIZE      512
-#define CFG_TUD_CDC_EP_BUFSIZE      CONFIG_USB_HS ? 512 : 64
+#define CFG_TUD_CDC_EP_BUFSIZE      (CONFIG_USB_HS ? 512 : 64)
 
 #ifdef __cplusplus
 }

examples/usb/otg/usb_host_device_mode_manual_switch/cdc_device/usb_descriptors.c

@@ -38,7 +38,7 @@
 #endif
 
 //------------- Interfaces enumeration -------------//
-typedef enum {
+enum {
     ITF_NUM_CDC = 0,
     ITF_NUM_CDC_DATA,
     ITF_NUM_TOTAL,