Ensure control pipe is selected in the PrinterHost demo before trying to send control...

diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
index 6ed7fa9..4c88bb4 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
+++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c
@@ -82,6 +82,8 @@ uint8_t Printer_GetDeviceID(char* DeviceIDString, uint16_t BufferSize)
                        wIndex:        0,\r
                        wLength:       sizeof(DeviceIDStringLength),\r
                };\r
                        wIndex:        0,\r
                        wLength:       sizeof(DeviceIDStringLength),\r
                };\r

+               \r
+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r

 \r
        if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r
 \r
        if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)\r
          return ErrorCode;\r


@@ -122,6 +124,8 @@ uint8_t Printer_GetPortStatus(uint8_t* PortStatus)
                        wLength:       sizeof(uint8_t),\r
                };\r
 \r
                        wLength:       sizeof(uint8_t),\r
                };\r
 \r

+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        return USB_Host_SendControlRequest(PortStatus);\r
 }\r
 \r
        return USB_Host_SendControlRequest(PortStatus);\r
 }\r
 \r


@@ -141,6 +145,8 @@ uint8_t Printer_SoftReset(void)
                        wLength:       0,\r
                };\r
 \r
                        wLength:       0,\r
                };\r
 \r

+       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r
+\r

        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r
        return USB_Host_SendControlRequest(NULL);\r
 }\r
 \r

diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
index 64adf22..5623dc7 100644 (file)
--- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
+++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c
@@ -226,8 +226,7 @@ void USB_Printer_Host(void)
                \r
                        Printer_Data_t TestPageData =\r
                                {\r
                \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
+                                       "\033%-12345X\033E LUFA PCL Test Page \033E\033%-12345X",\r

                                        (sizeof(TestPageData.Data) - 1)\r
                                };\r
                \r
                                        (sizeof(TestPageData.Data) - 1)\r
                                };\r
                \r