michi/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Magstripe Project: Ensure that empty tracks still print out a newline seperator so that the host always knows what track data is being sent.

Browse Source 
Updates to PrinterHost demo to include some PCL test data plus fixes to the GetDeviceID routine.
This commit is contained in:
Dean Camera
2009-07-19 07:30:37 +00:00
parent d6543dee0d
commit b243c2b80b
6 changed files with 83 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Demos/Host/Incomplete/PrinterHost/Lib/PrinterCommands.c
+14 -8
View File
@@ -32,7 +32,8 @@
uint8_t Printer_GetDeviceID(Device_ID_String_t* DeviceIDString)
{
uint8_t ErrorCode = HOST_SENDCONTROL_Successful;
uint8_t ErrorCode = HOST_SENDCONTROL_Successful;
uint16_t DeviceIDStringLength;
USB_ControlRequest = (USB_Request_Header_t)
{
@@ -40,19 +41,24 @@ uint8_t Printer_GetDeviceID(Device_ID_String_t* DeviceIDString)
bRequest: GET_DEVICE_ID,
wValue: 0,
wIndex: 0,
wLength: sizeof(DeviceIDString),
wLength: sizeof(DeviceIDString->Length),
};
if ((ErrorCode == USB_Host_SendControlRequest(DeviceIDString)) != HOST_SENDCONTROL_Successful)
if ((ErrorCode = USB_Host_SendControlRequest(DeviceIDString)) != HOST_SENDCONTROL_Successful)
return ErrorCode;
DeviceIDString->Length = SwapEndian_16(DeviceIDString->Length);
DeviceIDStringLength = SwapEndian_16(DeviceIDString->Length);
/* Protect against overflow for the null terminator if the string length is equal to or larger than the buffer */
if (DeviceIDString->Length >= sizeof(DeviceIDString->String))
DeviceIDString->Length = sizeof(DeviceIDString->String) - 1;
if (DeviceIDStringLength >= sizeof(DeviceIDString->String))
DeviceIDStringLength = sizeof(DeviceIDString->String) - 1;
USB_ControlRequest.wLength = DeviceIDStringLength;
DeviceIDString->String[DeviceIDString->Length] = 0x00;
if ((ErrorCode = USB_Host_SendControlRequest(DeviceIDString)) != HOST_SENDCONTROL_Successful)
return ErrorCode;
DeviceIDString->String[DeviceIDStringLength] = 0x00;
return HOST_SENDCONTROL_Successful;
}