From b3a4d8512bcaf0feba16a3cbeeaabfcfeb9cf051 Mon Sep 17 00:00:00 2001 From: Dean Camera <dean@fourwalledcubicle.com> Date: Wed, 20 May 2009 14:50:26 +0000 Subject: [PATCH] Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill). --- Demos/Device/USBtoSerial/Descriptors.c | 2 +- LUFA/ChangeLog.txt | 1 + LUFA/Drivers/USB/HighLevel/USBTask.h | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Demos/Device/USBtoSerial/Descriptors.c b/Demos/Device/USBtoSerial/Descriptors.c index d5ab8b754..ddb90bb8c 100644 --- a/Demos/Device/USBtoSerial/Descriptors.c +++ b/Demos/Device/USBtoSerial/Descriptors.c @@ -54,7 +54,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, .VendorID = 0x03EB, - .ProductID = 0x2044, + .ProductID = 0x204B, .ReleaseNumber = 0x0000, .ManufacturerStrIndex = 0x01, diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt index 7779576f4..6ccbb7fae 100644 --- a/LUFA/ChangeLog.txt +++ b/LUFA/ChangeLog.txt @@ -25,6 +25,7 @@ * - Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code * - Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code * - USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response to VBUS being removed + * - Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill) * * * \section Sec_ChangeLog090510 Version 090510 diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h index 21b1ae200..1e1209a5f 100644 --- a/LUFA/Drivers/USB/HighLevel/USBTask.h +++ b/LUFA/Drivers/USB/HighLevel/USBTask.h @@ -128,14 +128,15 @@ * in device mode) in order to manage USB communications. This task may be executed inside an RTOS, * scheduler (e.g. the simple LUFA Scheduler), fast timer ISR or the main user application loop. * - * The USB task must be serviced within 50mS in all modes, when needed. The task may be serviced - * at all times, or (for minimum CPU consumption): + * The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode. + * The task may be serviced at all times, or (for minimum CPU consumption): * * - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event * and disabled again on the firing of the \ref EVENT_USB_Disconnect() event. * * - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached() - * event and disabled again on the firing of the \ref EVENT_USB_DeviceUnattached() event. + * event and disabled again on the firing of the \ref EVENT_USB_DeviceEnumerationComplete() or + * \ref EVENT_USB_DeviceEnumerationFailed() events. * * If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library * by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch. -- GitLab