Commit cc879df4 authored by Dean Camera's avatar Dean Camera
Browse files

Use sane ANSI terminal escape codes for the Host mode demos, so that they do...

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.
parent 786479fa
...@@ -62,8 +62,7 @@ int main(void) ...@@ -62,8 +62,7 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET "CDC Host Demo running.\r\n"));
"CDC Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
...@@ -136,7 +135,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -136,7 +135,7 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); 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); printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -148,10 +147,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -148,10 +147,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
*/ */
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) 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(" -- Error Code %d\r\n"), ErrorCode);
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
...@@ -50,8 +50,7 @@ int main(void) ...@@ -50,8 +50,7 @@ int main(void)
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Bluetooth Host Demo running.\r\n" ESC_FG_WHITE));
"Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));
for (;;) for (;;)
{ {
...@@ -78,14 +77,14 @@ void SetupHardware(void) ...@@ -78,14 +77,14 @@ void SetupHardware(void)
void EVENT_USB_DeviceAttached(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); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
} }
void EVENT_USB_DeviceUnattached(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); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
...@@ -99,8 +98,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode) ...@@ -99,8 +98,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_ShutDown();
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
...@@ -108,10 +107,10 @@ void EVENT_USB_HostError(uint8_t ErrorCode) ...@@ -108,10 +107,10 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode) 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(" -- Error Code %d\r\n"), ErrorCode);
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
...@@ -129,11 +128,11 @@ void Bluetooth_Management_Task(void) ...@@ -129,11 +128,11 @@ void Bluetooth_Management_Task(void)
if ((ErrorCode = ProcessDeviceDescriptor()) != SuccessfulDeviceRead) if ((ErrorCode = ProcessDeviceDescriptor()) != SuccessfulDeviceRead)
{ {
if (ErrorCode == ControlErrorDuringDeviceRead) 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 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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDS_LED1); LEDs_SetAllLEDs(LEDS_LED1);
...@@ -148,8 +147,8 @@ void Bluetooth_Management_Task(void) ...@@ -148,8 +147,8 @@ void Bluetooth_Management_Task(void)
/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Set Configuration).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDS_LED1); LEDs_SetAllLEDs(LEDS_LED1);
...@@ -168,11 +167,11 @@ void Bluetooth_Management_Task(void) ...@@ -168,11 +167,11 @@ void Bluetooth_Management_Task(void)
if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
{ {
if (ErrorCode == ControlErrorDuringConfigRead) 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 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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDS_LED1); LEDs_SetAllLEDs(LEDS_LED1);
......
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
#include "PrinterCommands.h" #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 Printer_SendData(char* PrinterCommands)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;
......
...@@ -43,8 +43,7 @@ int main(void) ...@@ -43,8 +43,7 @@ int main(void)
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Printer Host Demo running.\r\n" ESC_FG_WHITE));
"Printer Host Demo running.\r\n" ESC_INVERSE_OFF));
for (;;) for (;;)
{ {
...@@ -70,13 +69,13 @@ void SetupHardware(void) ...@@ -70,13 +69,13 @@ void SetupHardware(void)
void EVENT_USB_DeviceAttached(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); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
} }
void EVENT_USB_DeviceUnattached(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); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
...@@ -84,8 +83,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode) ...@@ -84,8 +83,8 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_ShutDown();
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
...@@ -93,9 +92,9 @@ void EVENT_USB_HostError(uint8_t ErrorCode) ...@@ -93,9 +92,9 @@ void EVENT_USB_HostError(uint8_t ErrorCode)
void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode) 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(" -- 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
...@@ -121,9 +120,9 @@ void USB_Printer_Host(void) ...@@ -121,9 +120,9 @@ void USB_Printer_Host(void)
if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
{ {
if (ErrorCode == ControlError) 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 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"), ErrorCode);
...@@ -138,8 +137,8 @@ void USB_Printer_Host(void) ...@@ -138,8 +137,8 @@ void USB_Printer_Host(void)
/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Set Configuration).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -164,8 +163,8 @@ void USB_Printer_Host(void) ...@@ -164,8 +163,8 @@ void USB_Printer_Host(void)
if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Set Interface).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Set Interface).\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -184,8 +183,8 @@ void USB_Printer_Host(void) ...@@ -184,8 +183,8 @@ void USB_Printer_Host(void)
char DeviceIDString[128]; char DeviceIDString[128];
if ((ErrorCode = Printer_GetDeviceID(DeviceIDString, sizeof(DeviceIDString))) != HOST_SENDCONTROL_Successful) if ((ErrorCode = Printer_GetDeviceID(DeviceIDString, sizeof(DeviceIDString))) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Get DeviceID).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Get DeviceID).\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -212,8 +211,8 @@ void USB_Printer_Host(void) ...@@ -212,8 +211,8 @@ void USB_Printer_Host(void)
if ((ErrorCode = Printer_SendData(PCL_Test_Page)) != PIPE_RWSTREAM_NoError) if ((ErrorCode = Printer_SendData(PCL_Test_Page)) != PIPE_RWSTREAM_NoError)
{ {
puts_P(PSTR("Error Sending Test Page.\r\n")); puts_P(PSTR(ESC_FG_RED "Error Sending Test Page.\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
......
...@@ -43,8 +43,7 @@ int main(void) ...@@ -43,8 +43,7 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET ESC_FG_CYAN "CDC Host Demo running.\r\n" ESC_FG_WHITE));
"CDC Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
...@@ -76,7 +75,7 @@ void SetupHardware(void) ...@@ -76,7 +75,7 @@ void SetupHardware(void)
*/ */
void EVENT_USB_DeviceAttached(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); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
} }
...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void) ...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(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); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
...@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_ShutDown();
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
...@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
*/ */
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) 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(" -- Error Code %d\r\n"), ErrorCode);
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
...@@ -138,11 +137,11 @@ void CDC_Host_Task(void) ...@@ -138,11 +137,11 @@ void CDC_Host_Task(void)
if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
{ {
if (ErrorCode == ControlError) 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 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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -155,8 +154,8 @@ void CDC_Host_Task(void) ...@@ -155,8 +154,8 @@ void CDC_Host_Task(void)
/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Set Configuration).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\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 */ /* Indicate error via status LEDs */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
......
...@@ -43,8 +43,7 @@ int main(void) ...@@ -43,8 +43,7 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Generic HID Host Demo running.\r\n" ESC_FG_WHITE));
"Generic HID Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
...@@ -76,7 +75,7 @@ void SetupHardware(void) ...@@ -76,7 +75,7 @@ void SetupHardware(void)
*/ */
void EVENT_USB_DeviceAttached(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); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
} }
...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void) ...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(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); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
} }
...@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -102,8 +101,8 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
{ {
USB_ShutDown(); USB_ShutDown();
puts_P(PSTR(ESC_BG_RED "Host Mode Error\r\n")); puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode); printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
for(;;); for(;;);
...@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode) ...@@ -114,10 +113,10 @@ void EVENT_USB_HostError(const uint8_t ErrorCode)
*/ */
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) 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(" -- Error Code %d\r\n"), ErrorCode);
printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode); 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); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
} }
...@@ -239,11 +238,11 @@ void HID_Host_Task(void) ...@@ -239,11 +238,11 @@ void HID_Host_Task(void)
if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead) if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
{ {
if (ErrorCode == ControlError) 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 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 */ /* Indicate error status */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
...@@ -256,8 +255,8 @@ void HID_Host_Task(void) ...@@ -256,8 +255,8 @@ void HID_Host_Task(void)
/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */ /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful) if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
{ {
puts_P(PSTR("Control Error (Set Configuration).\r\n")); puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\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 */ /* Indicate error status */
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
......
...@@ -43,8 +43,7 @@ int main(void) ...@@ -43,8 +43,7 @@ int main(void)
{ {
SetupHardware(); SetupHardware();
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY puts_P(PSTR(ESC_RESET ESC_FG_CYAN "Keyboard HID Host Demo running.\r\n" ESC_FG_WHITE));
"Keyboard HID Host Demo running.\r\n" ESC_INVERSE_OFF));
LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
...@@ -76,7 +75,7 @@ void SetupHardware(void) ...@@ -76,7 +75,7 @@ void SetupHardware(void)
*/ */
void EVENT_USB_DeviceAttached(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); LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
} }
...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void) ...@@ -85,7 +84,7 @@ void EVENT_USB_DeviceAttached(void)
*/ */
void EVENT_USB_DeviceUnattached(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(