From 779eea97dbae3367fc714c0603eb04c070d3328c Mon Sep 17 00:00:00 2001 From: impressionyang Date: Mon, 25 Nov 2024 07:27:53 +0000 Subject: [PATCH] =?UTF-8?q?update:=20=F0=9F=93=9D=20=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E5=AE=8C=E6=88=90USB=E6=89=93=E5=8D=B0=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E4=BA=86MSC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/main.c | 2 +- main/utilities/usb_cherry/esp_setup/my_usb_setup.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/main.c b/main/main.c index c9a6f92..83d37c7 100755 --- a/main/main.c +++ b/main/main.c @@ -78,7 +78,7 @@ void app_main(void) // } int i = 0; while (1) { - cdc_printf("hello %d", i++); + cdc_printf("hello %d\r\n", i++); vTaskDelay(1000 / portTICK_PERIOD_MS); } printf("Restarting now.\n"); diff --git a/main/utilities/usb_cherry/esp_setup/my_usb_setup.c b/main/utilities/usb_cherry/esp_setup/my_usb_setup.c index ccfeadb..68af6d9 100644 --- a/main/utilities/usb_cherry/esp_setup/my_usb_setup.c +++ b/main/utilities/usb_cherry/esp_setup/my_usb_setup.c @@ -18,14 +18,14 @@ #define USBD_LANGID_STRING 1033 /*!< config descriptor size */ -#define USB_CONFIG_SIZE (9 + CDC_ACM_DESCRIPTOR_LEN + MSC_DESCRIPTOR_LEN) +#define USB_CONFIG_SIZE (9 + CDC_ACM_DESCRIPTOR_LEN )// + MSC_DESCRIPTOR_LEN) /*!< global descriptor */ static const uint8_t cdc_msc_descriptor[] = { USB_DEVICE_DESCRIPTOR_INIT(USB_2_0, 0xEF, 0x02, 0x01, USBD_VID, USBD_PID, 0x0100, 0x01), - USB_CONFIG_DESCRIPTOR_INIT(USB_CONFIG_SIZE, 0x03, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER), + USB_CONFIG_DESCRIPTOR_INIT(USB_CONFIG_SIZE, 0x02, 0x01, USB_CONFIG_BUS_POWERED, USBD_MAX_POWER), CDC_ACM_DESCRIPTOR_INIT(0x00, CDC_INT_EP, CDC_OUT_EP, CDC_IN_EP, 0x02), - MSC_DESCRIPTOR_INIT(0x02, MSC_OUT_EP, MSC_IN_EP, 0x00), + // MSC_DESCRIPTOR_INIT(0x02, MSC_OUT_EP, MSC_IN_EP, 0x00), /////////////////////////////////////// /// string0 descriptor /////////////////////////////////////// @@ -149,7 +149,7 @@ void cdc_acm_msc_init(void) usbd_interface_add_endpoint(&cdc_data_intf, &cdc_out_ep); usbd_interface_add_endpoint(&cdc_data_intf, &cdc_in_ep); - usbd_msc_class_init(MSC_OUT_EP, MSC_IN_EP); + // usbd_msc_class_init(MSC_OUT_EP, MSC_IN_EP); usbd_initialize(); }