Cleaner solution to the PrinterHost data send routine problem of embedded NULLs ...

[pub/USBasp.git] / Demos / Host / Incomplete / PrinterHost / PrinterHost.c

diff --git a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
index bff5e20..9eb05ab 100644 (file)
--- a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
+++ b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
@@ -204,12 +204,16 @@ void USB_Printer_Host(void)
                        /* Indicate device busy via the status LEDs */\r
                        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);\r
                \r
-                       char PCL_Test_Page[]   = "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X";\r
-//                     char ESCP2_Test_Page[] =  "\033@\033i\001\033X\001\060\000\r\nLUFA ESCP/2 Test Page\r\n";\r
-\r
-                       printf_P(PSTR("Sending Test Page (%d bytes)...\r\n"), (sizeof(PCL_Test_Page) - 1));\r
+                       Printer_Data_t TestPageData =\r
+                               {\r
+                                       "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X",\r
+//                                     "\033@\033i\001\033X\001\060\000\r\nLUFA ESCP/2 Test Page\r\n",\r
+                                       (sizeof(TestPageData.Data) - 1)\r
+                               };\r
+               \r
+                       printf_P(PSTR("Sending Test Page (%d bytes)...\r\n"), TestPageData.Length);\r
 \r
-                       if ((ErrorCode = Printer_SendData(PCL_Test_Page, (sizeof(PCL_Test_Page) - 1))) != PIPE_RWSTREAM_NoError)\r
+                       if ((ErrorCode = Printer_SendData(&TestPageData)) != PIPE_RWSTREAM_NoError)\r
                        {\r
                                puts_P(PSTR(ESC_FG_RED "Error Sending Test Page.\r\n"));\r
                                printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);\r