Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint addresses of 8 and above (thanks to John Andrews).

2 files changed, 6 insertions, 5 deletions

diff --git a/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
index 46e534d4b..9324a141c 100644
--- a/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
@@ -90,3 +90,4 @@ uint8_t Printer_SoftReset(void)
 

 	return USB_Host_SendControlRequest(NULL);

 }

+

diff --git a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
index 5cdd063fb..80fca259c 100644
--- a/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
+++ b/Demos/Host/Incomplete/PrinterHost/PrinterHost.c
@@ -184,6 +184,8 @@ void USB_Printer_Host(void)
 		

             //--------------------------------------------------------------

 			#define TEST_TEXT_PAGE "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X"

+//			#define TEST_TEXT_PAGE "\033@\033i\001\033X\001\060\000\r\nLUFA ESCP/2 Test Page\r\n"

+			#define PAGE_SIZE      (sizeof(TEST_TEXT_PAGE) - 1)

 

 			Pipe_SelectPipe(PRINTER_DATA_OUT_PIPE);

             Pipe_Unfreeze();

@@ -192,14 +194,12 @@ void USB_Printer_Host(void)
 			

 			while (!(Pipe_IsReadWriteAllowed()));

 

-			uint8_t strSize = sizeof(TEST_TEXT_PAGE)-1;

-

-			printf_P(PSTR("Printer Write Allowed, sending complete page (%d bytes)...\r\n"), strSize);

+			printf_P(PSTR("Printer Write Allowed, Sending Page (%d bytes)...\r\n"), PAGE_SIZE);

 				

-			Pipe_Write_Stream_LE(TEST_TEXT_PAGE, strSize);

+			Pipe_Write_Stream_LE(TEST_TEXT_PAGE, PAGE_SIZE);

             Pipe_ClearOUT();

 

-			puts_P(PSTR("Page sent to printer.\r\n"));

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

 

 			while (!(Pipe_IsReadWriteAllowed()));

             Pipe_Freeze();