Fixed compilation error in the AudioInput demos when MICROPHONE_BIASED_TO_HALF_RAIL...

[pub/USBasp.git] / Demos / Host / LowLevel / StillImageHost / StillImageHost.c

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index a337ab0..f89de22 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -37,14 +37,13 @@
 #include "StillImageHost.h"\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
 #include "StillImageHost.h"\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r

- *  starts the scheduler to run the application tasks.\r
+ *  enters a loop to run the application tasks in sequence.\r

  */\r
 int main(void)\r
 {\r
        SetupHardware();\r
 \r
  */\r
 int main(void)\r
 {\r
        SetupHardware();\r
 \r

-       puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
-              "Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));\r
+       puts_P(PSTR(ESC_FG_CYAN "Still Image Host Demo running.\r\n" ESC_FG_WHITE));\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r


@@ -75,36 +74,36 @@ void SetupHardware(void)
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-void EVENT_USB_DeviceAttached(void)\r
+void EVENT_USB_Host_DeviceAttached(void)\r

 {\r
 {\r

-       puts_P(PSTR("Device Attached.\r\n"));\r
+       puts_P(PSTR(ESC_FG_GREEN "Device Attached.\r\n" ESC_FG_WHITE));\r

        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and\r
  *  stops the library USB task management process.\r
  */\r

-void EVENT_USB_DeviceUnattached(void)\r
+void EVENT_USB_Host_DeviceUnattached(void)\r

 {\r
 {\r

-       puts_P(PSTR("\r\nDevice Unattached.\r\n"));\r
+       puts_P(PSTR(ESC_FG_GREEN "\r\nDevice Unattached.\r\n" ESC_FG_WHITE));\r

        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully\r
  *  enumerated by the host and is now ready to be used by the application.\r
  */\r

-void EVENT_USB_DeviceEnumerationComplete(void)\r
+void EVENT_USB_Host_DeviceEnumerationComplete(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 }\r
 \r
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */\r

-void EVENT_USB_HostError(const uint8_t ErrorCode)\r
+void EVENT_USB_Host_HostError(const uint8_t ErrorCode)\r

 {\r
        USB_ShutDown();\r
 \r
 {\r
        USB_ShutDown();\r
 \r

-       puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"\r
+                                " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r
 \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        for(;;);\r


@@ -113,12 +112,12 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while\r
  *  enumerating an attached USB device.\r
  */\r

-void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)\r

 {\r
 {\r

-       puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
-       printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r
-       printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
+       printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"\r
+                                " -- Error Code %d\r\n"\r
+                                " -- Sub Error Code %d\r\n"\r
+                                " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);\r

        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r


@@ -139,41 +138,39 @@ void StillImage_Task(void)
                        if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r
                        {\r
                                if (ErrorCode == ControlError)\r
                        if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)\r
                        {\r
                                if (ErrorCode == ControlError)\r

-                                 puts_P(PSTR("Control Error (Get Configuration).\r\n"));\r
+                                 puts_P(PSTR(ESC_FG_RED "Control Error (Get Configuration).\r\n"));\r

                                else\r
                                else\r

-                                 puts_P(PSTR("Invalid Device.\r\n"));\r
+                                 puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));\r

 \r
 \r

-                               printf_P(PSTR(" -- Error Code: %d\r\n"), ErrorCode);\r
+                               printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r

                                \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
                                \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r
                        {\r
                                break;\r
                        }\r
 \r
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r
                        {\r

-                               puts_P(PSTR("Control error.\r\n"));\r
+                               printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"\r
+                                                        " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r

 \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r
 \r
                                /* Indicate error via status LEDs */\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                                \r
                                break;\r
                        }\r
                                \r

+                       puts_P(PSTR("Still Image Device Enumerated.\r\n"));\r
+\r

                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r
                        USB_HostState = HOST_STATE_Configured;\r
                        break;\r
                case HOST_STATE_Configured:\r

-                       puts_P(PSTR("Still Image Device Enumerated.\r\n"));\r
-                               \r
-                       USB_HostState = HOST_STATE_Ready;\r
-                       break;\r
-               case HOST_STATE_Ready:\r

                        /* Indicate device busy via the status LEDs */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
                        \r
                        /* Indicate device busy via the status LEDs */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
                        \r


@@ -192,9 +189,11 @@ void StillImage_Task(void)
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response data block */\r
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response data block */\r

-                       if ((ErrorCode = SImage_RecieveBlockHeader()) != PIPE_RWSTREAM_NoError)\r
+                       if ((ErrorCode = SImage_ReceiveBlockHeader()) != PIPE_RWSTREAM_NoError)\r

                        {\r
                                ShowCommandError(ErrorCode, false);\r
                        {\r
                                ShowCommandError(ErrorCode, false);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                        \r
                                break;\r
                        }\r
                        \r


@@ -214,28 +213,28 @@ void StillImage_Task(void)
                        uint8_t* DeviceInfoPos = DeviceInfo;\r
                        \r
                        /* Skip over the data before the unicode device information strings */\r
                        uint8_t* DeviceInfoPos = DeviceInfo;\r
                        \r
                        /* Skip over the data before the unicode device information strings */\r

-                       DeviceInfoPos += 8;                                      // Skip to VendorExtensionDesc String\r
-                       DeviceInfoPos += ((*DeviceInfoPos << 1) + 1);            // Skip over VendorExtensionDesc String\r
-                       DeviceInfoPos += 2;                                      // Skip over FunctionalMode\r
-                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1)); // Skip over OperationCode Array\r
-                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1)); // Skip over EventCode Array\r
-                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1)); // Skip over DevicePropCode Array\r
-                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1)); // Skip over ObjectFormatCode Array\r
-                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1)); // Skip over ObjectFormatCode Array\r
+                       DeviceInfoPos +=  8;                                          // Skip to VendorExtensionDesc String\r
+                       DeviceInfoPos += (1 + UNICODE_STRING_LENGTH(*DeviceInfoPos)); // Skip over VendorExtensionDesc String\r
+                       DeviceInfoPos +=  2;                                          // Skip over FunctionalMode\r
+                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1));      // Skip over OperationCode Array\r
+                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1));      // Skip over EventCode Array\r
+                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1));      // Skip over DevicePropCode Array\r
+                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1));      // Skip over ObjectFormatCode Array\r
+                       DeviceInfoPos += (4 + (*(uint32_t*)DeviceInfoPos << 1));      // Skip over ObjectFormatCode Array\r

                        \r
                        /* Extract and convert the Manufacturer Unicode string to ASCII and print it through the USART */\r
                        char Manufacturer[*DeviceInfoPos];\r
                        UnicodeToASCII(DeviceInfoPos, Manufacturer);\r
                        printf_P(PSTR("   Manufacturer: %s\r\n"), Manufacturer);\r
 \r
                        \r
                        /* Extract and convert the Manufacturer Unicode string to ASCII and print it through the USART */\r
                        char Manufacturer[*DeviceInfoPos];\r
                        UnicodeToASCII(DeviceInfoPos, Manufacturer);\r
                        printf_P(PSTR("   Manufacturer: %s\r\n"), Manufacturer);\r
 \r

-                       DeviceInfoPos += ((*DeviceInfoPos << 1) + 1);            // Skip over Manufacturer String\r
+                       DeviceInfoPos += 1 + UNICODE_STRING_LENGTH(*DeviceInfoPos);   // Skip over Manufacturer String\r

 \r
                        /* Extract and convert the Model Unicode string to ASCII and print it through the USART */\r
                        char Model[*DeviceInfoPos];\r
                        UnicodeToASCII(DeviceInfoPos, Model);\r
                        printf_P(PSTR("   Model: %s\r\n"), Model);\r
 \r
 \r
                        /* Extract and convert the Model Unicode string to ASCII and print it through the USART */\r
                        char Model[*DeviceInfoPos];\r
                        UnicodeToASCII(DeviceInfoPos, Model);\r
                        printf_P(PSTR("   Model: %s\r\n"), Model);\r
 \r

-                       DeviceInfoPos += ((*DeviceInfoPos << 1) + 1);            // Skip over Model String\r
+                       DeviceInfoPos += 1 + UNICODE_STRING_LENGTH(*DeviceInfoPos);   // Skip over Model String\r

 \r
                        /* Extract and convert the Device Version Unicode string to ASCII and print it through the USART */\r
                        char DeviceVersion[*DeviceInfoPos];\r
 \r
                        /* Extract and convert the Device Version Unicode string to ASCII and print it through the USART */\r
                        char DeviceVersion[*DeviceInfoPos];\r


@@ -243,9 +242,11 @@ void StillImage_Task(void)
                        printf_P(PSTR("   Device Version: %s\r\n"), DeviceVersion);\r
 \r
                        /* Receive the final response block from the device */\r
                        printf_P(PSTR("   Device Version: %s\r\n"), DeviceVersion);\r
 \r
                        /* Receive the final response block from the device */\r

-                       if ((ErrorCode = SImage_RecieveBlockHeader()) != PIPE_RWSTREAM_NoError)\r
+                       if ((ErrorCode = SImage_ReceiveBlockHeader()) != PIPE_RWSTREAM_NoError)\r

                        {\r
                                ShowCommandError(ErrorCode, false);\r
                        {\r
                                ShowCommandError(ErrorCode, false);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                        \r
                                break;\r
                        }\r
                        \r


@@ -253,6 +254,8 @@ void StillImage_Task(void)
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                        \r
                                break;\r
                        }\r
                        \r


@@ -271,9 +274,11 @@ void StillImage_Task(void)
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response block from the device */\r
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response block from the device */\r

-                       if ((ErrorCode = SImage_RecieveBlockHeader()) != PIPE_RWSTREAM_NoError)\r
+                       if ((ErrorCode = SImage_ReceiveBlockHeader()) != PIPE_RWSTREAM_NoError)\r

                        {\r
                                ShowCommandError(ErrorCode, false);\r
                        {\r
                                ShowCommandError(ErrorCode, false);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                        \r
                                break;\r
                        }\r
                        \r


@@ -281,6 +286,8 @@ void StillImage_Task(void)
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r


@@ -299,9 +306,11 @@ void StillImage_Task(void)
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response block from the device */\r
                        SImage_SendBlockHeader();\r
                        \r
                        /* Receive the response block from the device */\r

-                       if ((ErrorCode = SImage_RecieveBlockHeader()) != PIPE_RWSTREAM_NoError)\r
+                       if ((ErrorCode = SImage_ReceiveBlockHeader()) != PIPE_RWSTREAM_NoError)\r

                        {\r
                                ShowCommandError(ErrorCode, false);\r
                        {\r
                                ShowCommandError(ErrorCode, false);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r


@@ -309,6 +318,8 @@ void StillImage_Task(void)
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r
                        if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))\r
                        {\r
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);\r

+                               \r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r


@@ -317,9 +328,7 @@ void StillImage_Task(void)
                        /* Indicate device no longer busy */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                        \r
                        /* Indicate device no longer busy */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
                        \r

-                       /* Wait until USB device disconnected */\r
-                       while (USB_IsConnected);\r
-                       \r
+                       USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                        break;\r
        }\r
 }\r
                        break;\r
        }\r
 }\r


@@ -327,8 +336,8 @@ void StillImage_Task(void)
 /** Function to convert a given Unicode encoded string to ASCII. This function will only work correctly on Unicode\r
  *  strings which contain ASCII printable characters only.\r
  *\r
 /** Function to convert a given Unicode encoded string to ASCII. This function will only work correctly on Unicode\r
  *  strings which contain ASCII printable characters only.\r
  *\r

- *  \param UnicodeString  Pointer to a Unicode encoded input string\r
- *  \param Buffer         Pointer to a buffer where the converted ASCII string should be stored\r
+ *  \param[in] UnicodeString  Pointer to a Unicode encoded input string\r
+ *  \param[out] Buffer        Pointer to a buffer where the converted ASCII string should be stored\r

  */\r
 void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)\r
 {\r
  */\r
 void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)\r
 {\r


@@ -338,7 +347,7 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)
        /* Loop through the entire unicode string */\r
        while (CharactersRemaining--)\r
        {\r
        /* Loop through the entire unicode string */\r
        while (CharactersRemaining--)\r
        {\r

-               /* Load in the next unicode character (only the lower byte, only Unicode coded ASCII supported) */\r
+               /* Load in the next unicode character (only the lower byte, as only Unicode coded ASCII is supported) */\r

                *(Buffer++) = *UnicodeString;\r
                \r
                /* Jump to the next unicode character */\r
                *(Buffer++) = *UnicodeString;\r
                \r
                /* Jump to the next unicode character */\r


@@ -351,19 +360,16 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)
 \r
 /** Displays a PIMA command error via the device's serial port.\r
  *\r
 \r
 /** Displays a PIMA command error via the device's serial port.\r
  *\r

- *  \param ErrorCode          Error code of the function which failed to complete successfully\r
- *  \param ResponseCodeError  Indicates if the error is due to a command failed indication from the device, or a communication failure\r
+ *  \param[in] ErrorCode          Error code of the function which failed to complete successfully\r
+ *  \param[in] ResponseCodeError  Indicates if the error is due to a command failed indication from the device, or a communication failure\r

  */\r
 void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)\r
 {\r
        char* FailureType = ((ResponseCodeError) ? PSTR("Response Code != OK") : PSTR("Transaction Fail"));\r
 \r
  */\r
 void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)\r
 {\r
        char* FailureType = ((ResponseCodeError) ? PSTR("Response Code != OK") : PSTR("Transaction Fail"));\r
 \r

-       printf_P(PSTR(ESC_BG_RED "Command Error (%S).\r\n"), FailureType);\r
-       printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
+       printf_P(PSTR(ESC_FG_RED "Command Error (%S).\r\n"\r
+                                " -- Error Code %d\r\n" ESC_FG_WHITE), FailureType, ErrorCode);\r

                        \r
        /* Indicate error via status LEDs */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        \r
        /* Indicate error via status LEDs */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

-                               \r
-       /* Wait until USB device disconnected */\r
-       while (USB_IsConnected);\r

 }\r
 }\r