Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill).

diff --git a/Demos/Device/USBtoSerial/Descriptors.c b/Demos/Device/USBtoSerial/Descriptors.c
index d5ab8b7..ddb90bb 100644 (file)
--- 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,\r
                \r
        .VendorID               = 0x03EB,\r
        .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r
                \r
        .VendorID               = 0x03EB,\r

-       .ProductID              = 0x2044,\r
+       .ProductID              = 0x204B,\r

        .ReleaseNumber          = 0x0000,\r
                \r
        .ManufacturerStrIndex   = 0x01,\r
        .ReleaseNumber          = 0x0000,\r
                \r
        .ManufacturerStrIndex   = 0x01,\r

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 7779576..6ccbb7f 100644 (file)
--- 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\r
   *  - Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code\r
   *  - USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response to VBUS being removed\r
   *  - Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code\r
   *  - Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code\r
   *  - USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response to VBUS being removed\r

+  *  - Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill)\r

   *\r
   *\r
   *  \section Sec_ChangeLog090510 Version 090510\r
   *\r
   *\r
   *  \section Sec_ChangeLog090510 Version 090510\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 21b1ae2..1e1209a 100644 (file)
--- 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,\r
                         *  scheduler (e.g. the simple LUFA Scheduler), fast timer ISR or the main user application loop.\r
                         *\r
                         *  in device mode) in order to manage USB communications. This task may be executed inside an RTOS,\r
                         *  scheduler (e.g. the simple LUFA Scheduler), fast timer ISR or the main user application loop.\r
                         *\r

-                        *  The USB task must be serviced within 50mS in all modes, when needed. The task may be serviced \r
-                        *  at all times, or (for minimum CPU consumption):\r
+                        *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.\r
+                        *  The task may be serviced at all times, or (for minimum CPU consumption):\r

                         *\r
                         *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event\r
                         *    and disabled again on the firing of the \ref EVENT_USB_Disconnect() event.\r
                         *\r
                         *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached()\r
                         *\r
                         *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Connect() event\r
                         *    and disabled again on the firing of the \ref EVENT_USB_Disconnect() event.\r
                         *\r
                         *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_DeviceAttached()\r

-                        *    event and disabled again on the firing of the \ref EVENT_USB_DeviceUnattached() event.\r
+                        *    event and disabled again on the firing of the \ref EVENT_USB_DeviceEnumerationComplete() or\r
+                        *    \ref EVENT_USB_DeviceEnumerationFailed() events.\r

                         *\r
                         *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library\r
                         *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.\r
                         *\r
                         *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library\r
                         *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.\r