Use sane ANSI terminal escape codes for the Host mode demos, so that they do not cause eye-searing, unreadable text on terminals which parse the escape codes properly.

14 files changed, 179 insertions, 183 deletions

diff --git a/Demos/Host/ClassDriver/CDCHost/CDCHost.c b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
index eb45afe80..46b4f6f3f 100644
--- a/Demos/Host/ClassDriver/CDCHost/CDCHost.c
+++ b/Demos/Host/ClassDriver/CDCHost/CDCHost.c
@@ -62,8 +62,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET "CDC Host Demo running.\r\n"));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -136,7 +135,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n" ESC_FG_WHITE));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -148,10 +147,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index 3222b770e..177478659 100644
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -50,8 +50,7 @@ int main(void)
 	

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Bluetooth Host Demo running.\r\n" ESC_FG_WHITE));

 		   

 	for (;;)

 	{

@@ -78,14 +77,14 @@ void SetupHardware(void)
 

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

@@ -99,8 +98,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -108,10 +107,10 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
 

 void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -129,11 +128,11 @@ void Bluetooth_Management_Task(void)
 			if ((ErrorCode = ProcessDeviceDescriptor()) != SuccessfulDeviceRead)

 			{

 				if (ErrorCode == ControlErrorDuringDeviceRead)

-				  puts_P(PSTR("Control Error (Get Device).\r\n"));

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDS_LED1);

@@ -148,8 +147,8 @@ void Bluetooth_Management_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDS_LED1);

@@ -168,11 +167,11 @@ void Bluetooth_Management_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlErrorDuringConfigRead)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDS_LED1);

diff --git a/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
index 075b2d601..668421d91 100644
--- a/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
@@ -30,6 +30,13 @@
 

 #include "PrinterCommands.h"

 

+/** Sends the given data directly to the printer via the data endpoints, for the sending of print commands in printer

+ *  languages accepted by the attached printer (e.g. PCL).

+ *

+ *  \param[in] PrinterCommands  Pointer to the input buffer containing the printer data to send

+ *

+ *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum

+ */

 uint8_t Printer_SendData(char* PrinterCommands)

 {

 	uint8_t ErrorCode;

diff --git a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
index ea179b687..27151a2de 100644
--- a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
+++ b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
@@ -43,8 +43,7 @@ int main(void)
 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Printer Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Printer Host Demo running.\r\n" ESC_FG_WHITE));

 	

 	for (;;)

 	{

@@ -70,13 +69,13 @@ void SetupHardware(void)
 

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -84,8 +83,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -93,9 +92,9 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
 

 void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -121,9 +120,9 @@ void USB_Printer_Host(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

 				

@@ -138,8 +137,8 @@ void USB_Printer_Host(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -164,8 +163,8 @@ void USB_Printer_Host(void)
 					

 				if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 				{

-					puts_P(PSTR("Control Error (Set Interface).\r\n"));

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

+					puts_P(PSTR(ESC_FG_RED "Control Error (Set Interface).\r\n"));

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

 

 					/* Indicate error via status LEDs */

 					LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -184,8 +183,8 @@ void USB_Printer_Host(void)
 			char DeviceIDString[128];

 			if ((ErrorCode = Printer_GetDeviceID(DeviceIDString, sizeof(DeviceIDString))) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Get DeviceID).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -212,8 +211,8 @@ void USB_Printer_Host(void)
 

 			if ((ErrorCode = Printer_SendData(PCL_Test_Page)) != PIPE_RWSTREAM_NoError)

 			{

-				puts_P(PSTR("Error Sending Test Page.\r\n"));

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

+				puts_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"));

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/CDCHost/CDCHost.c
index de7ab88c6..7d5195dc6 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.c
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "CDC Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -138,11 +137,11 @@ void CDC_Host_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -155,8 +154,8 @@ void CDC_Host_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
index a1b62ac62..5c0e5c0e7 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Generic HID Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Generic HID Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

-	puts_P(PSTR("Device Unattached.\r\n"));

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -239,11 +238,11 @@ void HID_Host_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -256,8 +255,8 @@ void HID_Host_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
index 2517848b0..5d39bf902 100644
--- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Keyboard HID Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Keyboard HID Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

-	puts_P(PSTR("Device Unattached.\r\n"));

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -203,11 +202,11 @@ void Keyboard_HID_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -220,8 +219,8 @@ void Keyboard_HID_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -250,8 +249,8 @@ void Keyboard_HID_Task(void)
 			/* Send the request, display error and wait for device detach if request fails */

 			if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Protocol).\r\n"));

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

+				puts_P(PSTR(ESC_FG_RED "Control Error (Set Protocol).\r\n"));

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
index 2ef15e7b8..e9af2253d 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Keyboard HID Parser Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Keyboard HID Parser Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -138,11 +137,11 @@ void Keyboard_HID_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -156,8 +155,8 @@ void Keyboard_HID_Task(void)
 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -175,8 +174,8 @@ void Keyboard_HID_Task(void)
 			/* Get and process the device's first HID report descriptor */

 			if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)

 			{

-				puts_P(PSTR("Report Parse Error.\r\n"));

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

+				puts_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"));

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

 			

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
index 1bb94f6c8..99f116eb3 100644
--- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c
@@ -48,8 +48,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Mass Storage Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Mass Storage Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -82,7 +81,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -91,7 +90,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -108,8 +107,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -120,10 +119,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -144,11 +143,11 @@ void MassStorage_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -161,8 +160,8 @@ void MassStorage_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -373,14 +372,14 @@ void ShowDiskReadError(char* CommandString, bool FailedAtSCSILayer, uint8_t Erro
 	if (FailedAtSCSILayer)

 	{

 		/* Display the error code */

-		printf_P(PSTR(ESC_BG_RED "SCSI command error (%S).\r\n"), CommandString);

-		printf_P(PSTR("  -- Status Code: %d"), ErrorCode);

+		printf_P(PSTR(ESC_FG_RED "SCSI command error (%S).\r\n"), CommandString);

+		printf_P(PSTR("  -- Status Code: %d" ESC_FG_WHITE), ErrorCode);

 	}

 	else

 	{

 		/* Display the error code */

-		printf_P(PSTR(ESC_BG_RED "Command error (%S).\r\n"), CommandString);

-		printf_P(PSTR("  -- Error Code: %d"), ErrorCode);	

+		printf_P(PSTR(ESC_FG_RED "Command error (%S).\r\n"), CommandString);

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

 	}

 

 	Pipe_Freeze();

diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.c b/Demos/Host/LowLevel/MouseHost/MouseHost.c
index d5c4bf941..444858622 100644
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.c
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Mouse HID Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Mouse HID Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

-	puts_P(PSTR("Device Unattached.\r\n"));

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -199,11 +198,11 @@ void Mouse_HID_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -216,8 +215,8 @@ void Mouse_HID_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -246,8 +245,8 @@ void Mouse_HID_Task(void)
 			/* Send the request, display error and wait for device detach if request fails */

 			if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Protocol).\r\n"));

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

+				puts_P(PSTR(ESC_FG_RED "Control Error (Set Protocol).\r\n"));

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

 

 				/* Indicate error status */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
index 1e931232c..20730194a 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Mouse HID Parser Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Mouse HID Parser Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -76,7 +75,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

-	puts_P(PSTR("Device Unattached.\r\n"));

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -139,11 +138,11 @@ void Mouse_HID_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -156,8 +155,8 @@ void Mouse_HID_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control Error (Set Configuration).\r\n"));

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

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -175,8 +174,8 @@ void Mouse_HID_Task(void)
 			/* Get and process the device's first HID report descriptor */

 			if ((ErrorCode = GetHIDReportData()) != ParseSuccessful)

 			{

-				puts_P(PSTR("Report Parse Error.\r\n"));

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

+				puts_P(PSTR(ESC_FG_RED "Report Parse Error.\r\n"));

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

 			

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index 0f511ad7a..a62c67ab4 100644
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	       "Still Image Host Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Still Image Host Demo running.\r\n" ESC_FG_WHITE));

 

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 

@@ -77,7 +76,7 @@ void SetupHardware(void)
  */

 void EVENT_USB_DeviceAttached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

@@ -86,7 +85,7 @@ void EVENT_USB_DeviceAttached(void)
  */

 void EVENT_USB_DeviceUnattached(void)

 {

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

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

 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

@@ -103,8 +102,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 {

 	USB_ShutDown();

 

-	puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));

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

 

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 	for(;;);

@@ -115,10 +114,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
  */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 	

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

 }

@@ -139,11 +138,11 @@ void StillImage_Task(void)
 			if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)

 			{

 				if (ErrorCode == ControlError)

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

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

 				else

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

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

 

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

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

 				

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -156,7 +155,8 @@ void StillImage_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */

 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)

 			{

-				puts_P(PSTR("Control error.\r\n"));

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

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

 

 				/* Indicate error via status LEDs */

 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

@@ -372,8 +372,8 @@ void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError)
 {

 	char* FailureType = ((ResponseCodeError) ? PSTR("Response Code != OK") : PSTR("Transaction Fail"));

 

-	printf_P(PSTR(ESC_BG_RED "Command Error (%S).\r\n"), FailureType);

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

+	printf_P(PSTR(ESC_FG_RED "Command Error (%S).\r\n"), FailureType);

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

 			

 	/* Indicate error via status LEDs */

 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c
index 778c14b4a..bf84a7e4f 100644
--- a/Demos/OTG/TestApp/TestApp.c
+++ b/Demos/OTG/TestApp/TestApp.c
@@ -43,8 +43,7 @@ int main(void)
 {

 	SetupHardware();

 	

-	puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY

-	            "LUFA Demo running.\r\n" ESC_INVERSE_OFF));

+	puts_P(PSTR(ESC_RESET ESC_FG_CYAN "LUFA Demo running.\r\n" ESC_FG_WHITE));

 

 	for (;;)

 	{

@@ -148,11 +147,11 @@ void CheckButton(void)
 			if (USB_IsInitialized == true)

 			{

 				USB_ShutDown();

-				puts_P(PSTR(ESC_BG_WHITE "USB Power Off.\r\n"));

+				puts_P(PSTR(ESC_FG_YELLOW "USB Power Off.\r\n" ESC_FG_WHITE));

 			}

 			else

 			{

-				puts_P(PSTR(ESC_BG_YELLOW "USB Power On.\r\n"));				

+				puts_P(PSTR(ESC_FG_YELLOW "USB Power On.\r\n" ESC_FG_WHITE));				

 				USB_Init(USB_MODE_UID, USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL);

 			}

 		}

diff --git a/Demos/OTG/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c
index 9b091472f..d0bc805db 100644
--- a/Demos/OTG/TestApp/TestEvents.c
+++ b/Demos/OTG/TestApp/TestEvents.c
@@ -50,26 +50,26 @@ static void Abort_Program(void)
 

 	LEDs_SetAllLEDs(LEDS_LED1 | LEDS_LED3);

 

-	puts_P(PSTR(ESC_INVERSE_ON "\r\n**PROGRAM ABORT**"));

+	puts_P(PSTR(ESC_FG_RED ESC_INVERSE_ON "\r\n**PROGRAM ABORT**" ESC_FG_WHITE));

 	for (;;);

 }

 

 /** Event handler for the USB_VBUSChange event. When fired, the event is logged to the USART. */

 void EVENT_USB_VBUSChange(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "VBUS Change\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS Change\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_VBUSConnect event. When fired, the event is logged to the USART. */

 void EVENT_USB_VBUSConnect(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "VBUS +\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS +\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_VBUSDisconnect event. When fired, the event is logged to the USART. */

 void EVENT_USB_VBUSDisconnect(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "VBUS -\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "VBUS -\r\n" ESC_FG_WHITE));

 }

 

 /**

@@ -78,7 +78,7 @@ void EVENT_USB_VBUSDisconnect(void)
  */

 void EVENT_USB_Connect(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "USB  +\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB  +\r\n" ESC_FG_WHITE));

 }

 

 /**

@@ -87,25 +87,25 @@ void EVENT_USB_Connect(void)
  */

 void EVENT_USB_Disconnect(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "USB  -\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB  -\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_Suspend event. When fired, the event is logged to the USART. */

 void EVENT_USB_Suspend(void)

 {

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "USB Sleep\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Sleep\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_WakeUp event. When fired, the event is logged to the USART. */

 void EVENT_USB_WakeUp(void)

 {

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "USB Wakeup\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Wakeup\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_Reset event. When fired, the event is logged to the USART. */

 void EVENT_USB_Reset(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "USB Reset\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "USB Reset\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_UIDChange event. When fired, the event is logged to the USART. */

@@ -113,7 +113,7 @@ void EVENT_USB_UIDChange(void)
 {

 	char* ModeStrPtr;

 

-	puts_P(PSTR(EVENT_PREFIX "UID Change\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "UID Change\r\n"));

 

 	if (USB_CurrentMode == USB_MODE_DEVICE)

 	  ModeStrPtr = PSTR("HOST");

@@ -122,7 +122,7 @@ void EVENT_USB_UIDChange(void)
 	else

 	  ModeStrPtr = PSTR("N/A");

 

-	printf_P(PSTR(" -- New Mode %S\r\n"), ModeStrPtr);

+	printf_P(PSTR(" -- New Mode %S\r\n" ESC_FG_WHITE), ModeStrPtr);

 }

 

 /**

@@ -133,7 +133,7 @@ void EVENT_USB_InitFailure(const uint8_t ErrorCode)
 {

 	char* ModeStrPtr;

 	

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Power On Fail\r\n"));

+	puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Power On Fail\r\n"));

 

 	if (USB_CurrentMode == USB_MODE_DEVICE)

 	  ModeStrPtr = PSTR("DEVICE");

@@ -143,7 +143,7 @@ void EVENT_USB_InitFailure(const uint8_t ErrorCode)
 	  ModeStrPtr = PSTR("N/A");

 	

 	printf_P(PSTR(" -- Mode %S\r\n"), ModeStrPtr);

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

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

 

 	Abort_Program();

 }

@@ -154,8 +154,8 @@ void EVENT_USB_InitFailure(const uint8_t ErrorCode)
  */

 void EVENT_USB_HostError(const uint8_t ErrorCode)

 {

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Host Mode Error\r\n"));

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

+	puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Host Mode Error\r\n"));

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

 

 	Abort_Program();

 }

@@ -163,41 +163,41 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. When fired, the event is logged to the USART. */

 void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)

 {

-	puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));

+	puts_P(PSTR(ESC_FG_RED EVENT_PREFIX "Dev Enum Error\r\n"));

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

 	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);

-	printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);

+	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);

 }

 

 /** Event handler for the USB_UnhandledControlPacket event. When fired, the event is logged to the USART. */

 void EVENT_USB_UnhandledControlPacket(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "Ctrl Request\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Ctrl Request\r\n"));

 	printf_P(PSTR(" -- Req Data %d\r\n"), USB_ControlRequest.bRequest);

 	printf_P(PSTR(" -- Req Type %d\r\n"), USB_ControlRequest.bmRequestType);

-	printf_P(PSTR(" -- Req Length %d\r\n"), USB_ControlRequest.wLength);

+	printf_P(PSTR(" -- Req Length %d\r\n" ESC_FG_WHITE), USB_ControlRequest.wLength);

 }

 

 /** Event handler for the USB_ConfigurationChanged event. When fired, the event is logged to the USART. */

 void EVENT_USB_ConfigurationChanged(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "Configuration Number Changed\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Configuration Number Changed\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_DeviceAttached event. When fired, the event is logged to the USART. */

 void EVENT_USB_DeviceAttached(void)

 {

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_GREEN "Device +\r\n"));

+	puts_P(PSTR(ESC_FG_GREEN EVENT_PREFIX "Device +\r\n" ESC_FG_WHITE));

 }

 

 /** Event handler for the USB_DeviceUnattached event. When fired, the event is logged to the USART. */

 void EVENT_USB_DeviceUnattached(void)

 {

-	puts_P(PSTR(EVENT_PREFIX ESC_BG_YELLOW "Device -\r\n"));

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

 }

 

 /** Event handler for the USB_DeviceEnumerationComplete event. When fired, the event is logged to the USART. */

 void EVENT_USB_DeviceEnumerationComplete(void)

 {

-	puts_P(PSTR(EVENT_PREFIX "Device Enumeration Complete\r\n"));

+	puts_P(PSTR(ESC_FG_YELLOW EVENT_PREFIX "Device Enumeration Complete\r\n" ESC_FG_WHITE));

 }