update: 📝 初步完成USB打印,关闭了MSC
This commit is contained in:
parent
7bbdfc0bf4
commit
779eea97db
@ -78,7 +78,7 @@ void app_main(void)
|
|||||||
// }
|
// }
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while (1) {
|
while (1) {
|
||||||
cdc_printf("hello %d", i++);
|
cdc_printf("hello %d\r\n", i++);
|
||||||
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
||||||
}
|
}
|
||||||
printf("Restarting now.\n");
|
printf("Restarting now.\n");
|
||||||
|
|||||||
@ -18,14 +18,14 @@
|
|||||||
#define USBD_LANGID_STRING 1033
|
#define USBD_LANGID_STRING 1033
|
||||||
|
|
||||||
/*!< config descriptor size */
|
/*!< 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 */
|
/*!< global descriptor */
|
||||||
static const uint8_t cdc_msc_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_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),
|
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
|
/// 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_out_ep);
|
||||||
usbd_interface_add_endpoint(&cdc_data_intf, &cdc_in_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();
|
usbd_initialize();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user