Trim unique serial number created by the USE_INTERNAL_SERIAL option to 12 characters...

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
index 4fac1d0..0db804c 100644 (file)
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.txt
@@ -40,7 +40,7 @@
  *  \r
  *  This demo prints out received CDC data through the serial port.\r
  *  \r
  *  \r
  *  This demo prints out received CDC data through the serial port.\r
  *  \r

- *  Not that this demo is only compatible with devices which report the correct CDC\r
+ *  Note that this demo is only compatible with devices which report the correct CDC\r

  *  and ACM class, subclass and protocol values. Most USB-Serial cables have vendor\r
  *  specific features, thus use vendor-specific class/subclass/protocol codes to force\r
  *  the user to use specialized drivers. This demo is not compatible with such devices.\r
  *  and ACM class, subclass and protocol values. Most USB-Serial cables have vendor\r
  *  specific features, thus use vendor-specific class/subclass/protocol codes to force\r
  *  the user to use specialized drivers. This demo is not compatible with such devices.\r

diff --git a/LUFA/Drivers/Misc/TerminalCodes.h b/LUFA/Drivers/Misc/TerminalCodes.h
index 11dcc03..0e67f94 100644 (file)
--- a/LUFA/Drivers/Misc/TerminalCodes.h
+++ b/LUFA/Drivers/Misc/TerminalCodes.h
@@ -47,7 +47,7 @@
  *\r
  *  \note If desired, the macro DISABLE_TERMINAL_CODES can be defined in the project makefile and passed to the GCC\r
  *        compiler via the -D switch to disable the terminal codes without modifying the source, for use with non\r
  *\r
  *  \note If desired, the macro DISABLE_TERMINAL_CODES can be defined in the project makefile and passed to the GCC\r
  *        compiler via the -D switch to disable the terminal codes without modifying the source, for use with non\r

- *        compatible terminals (any terminal code then equate to empty strings).\r
+ *        compatible terminals (any terminal codes then equate to empty strings).\r

  *\r
  *  Example Usage:\r
  *  \code\r
  *\r
  *  Example Usage:\r
  *  \code\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 9acf300..55b49b8 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -182,14 +182,14 @@ static void USB_Device_GetDescriptor(void)
        #if defined(USE_INTERNAL_SERIAL)\r
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
        {\r
        #if defined(USE_INTERNAL_SERIAL)\r
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
        {\r

-               uint8_t SignatureDescriptor[2 + (sizeof(int16_t) * 20)];\r
+               uint8_t SignatureDescriptor[2 + (sizeof(int16_t) * 12)];\r

 \r
                SignatureDescriptor[0] = sizeof(SignatureDescriptor);\r
                SignatureDescriptor[1] = DTYPE_String;\r
                \r
                uint16_t* SigUnicodeChars = (uint16_t*)&SignatureDescriptor[2];\r
 \r
 \r
                SignatureDescriptor[0] = sizeof(SignatureDescriptor);\r
                SignatureDescriptor[1] = DTYPE_String;\r
                \r
                uint16_t* SigUnicodeChars = (uint16_t*)&SignatureDescriptor[2];\r
 \r

-               for (uint8_t SerialByteNum = 0; SerialByteNum < 10; SerialByteNum++)\r
+               for (uint8_t SerialByteNum = 0; SerialByteNum < 6; SerialByteNum++)\r

                {\r
                        char ConvSigString[3];\r
 \r
                {\r
                        char ConvSigString[3];\r
 \r

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 8231ca9..9704131 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -24,4 +24,5 @@
   *  - Master LUFA include file\r
   *  - Debug mode for pipe/endpoint calls\r
   *  - Add hub support to match Atmel's stack\r
   *  - Master LUFA include file\r
   *  - Debug mode for pipe/endpoint calls\r
   *  - Add hub support to match Atmel's stack\r

+  *  - Update Host mode Class Driver demo .txt files\r

   */\r
   */\r