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.

1 files changed, 16 insertions, 17 deletions

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();