Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint...

[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 5cdd063..80fca25 100644 (file)
--- a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
+++ b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
@@ -184,6 +184,8 @@ void USB_Printer_Host(void)
                \r
             //--------------------------------------------------------------\r
                        #define TEST_TEXT_PAGE "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X"\r
                \r
             //--------------------------------------------------------------\r
                        #define TEST_TEXT_PAGE "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X"\r

+//                     #define TEST_TEXT_PAGE "\033@\033i\001\033X\001\060\000\r\nLUFA ESCP/2 Test Page\r\n"\r
+                       #define PAGE_SIZE      (sizeof(TEST_TEXT_PAGE) - 1)\r

 \r
                        Pipe_SelectPipe(PRINTER_DATA_OUT_PIPE);\r
             Pipe_Unfreeze();\r
 \r
                        Pipe_SelectPipe(PRINTER_DATA_OUT_PIPE);\r
             Pipe_Unfreeze();\r


@@ -192,14 +194,12 @@ void USB_Printer_Host(void)
                        \r
                        while (!(Pipe_IsReadWriteAllowed()));\r
 \r
                        \r
                        while (!(Pipe_IsReadWriteAllowed()));\r
 \r

-                       uint8_t strSize = sizeof(TEST_TEXT_PAGE)-1;\r
-\r
-                       printf_P(PSTR("Printer Write Allowed, sending complete page (%d bytes)...\r\n"), strSize);\r
+                       printf_P(PSTR("Printer Write Allowed, Sending Page (%d bytes)...\r\n"), PAGE_SIZE);\r

                                \r
                                \r

-                       Pipe_Write_Stream_LE(TEST_TEXT_PAGE, strSize);\r
+                       Pipe_Write_Stream_LE(TEST_TEXT_PAGE, PAGE_SIZE);\r

             Pipe_ClearOUT();\r
 \r
             Pipe_ClearOUT();\r
 \r

-                       puts_P(PSTR("Page sent to printer.\r\n"));\r
+                       puts_P(PSTR("Page Sent, Waiting for Pipe...\r\n"));\r

 \r
                        while (!(Pipe_IsReadWriteAllowed()));\r
             Pipe_Freeze();                             \r
 \r
                        while (!(Pipe_IsReadWriteAllowed()));\r
             Pipe_Freeze();                             \r