Commit 4530a546 authored by Dean Camera's avatar Dean Camera
Browse files

Fix broken MagStripe demo due to the HID Class driver changes.

parent 6bbd2a99
...@@ -180,18 +180,18 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn ...@@ -180,18 +180,18 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
if ((IsKeyReleaseReport) || (CurrentTrackBuffer == &TrackDataBuffers[TOTAL_TRACKS])) if ((IsKeyReleaseReport) || (CurrentTrackBuffer == &TrackDataBuffers[TOTAL_TRACKS]))
{ {
/* No more data to send, or key release report between key presses */ /* No more data to send, or key release report between key presses */
KeyboardReport->KeyCode = KEY_NONE; KeyboardReport->KeyCode[0] = KEY_NONE;
} }
else if (!(CurrentTrackBuffer->Elements)) else if (!(CurrentTrackBuffer->Elements))
{ {
/* End of current track, send an enter press and change to the next track's buffer */ /* End of current track, send an enter press and change to the next track's buffer */
KeyboardReport->KeyCode = KEY_ENTER; KeyboardReport->KeyCode[0] = KEY_ENTER;
CurrentTrackBuffer++; CurrentTrackBuffer++;
} }
else else
{ {
/* Still data in the current track; convert next bit to a 1 or 0 keypress */ /* Still data in the current track; convert next bit to a 1 or 0 keypress */
KeyboardReport->KeyCode = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0; KeyboardReport->KeyCode[0] = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0;
} }
*ReportSize = sizeof(USB_KeyboardReport_Data_t); *ReportSize = sizeof(USB_KeyboardReport_Data_t);
......
...@@ -65,18 +65,6 @@ ...@@ -65,18 +65,6 @@
/** HID keyboard keycode to indicate that the enter key is currently pressed. */ /** HID keyboard keycode to indicate that the enter key is currently pressed. */
#define KEY_ENTER 40 #define KEY_ENTER 40
/* Type Defines: */
/** Type define for the keyboard report structure. This structure matches the report layout
* given to the host in the HID Report descriptor, as well as matches the boot protocol report
* structure. This means that this one report structure can be used in both Report and Boot Protocol
* modes. */
typedef struct
{
uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */
uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */
uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */
} USB_KeyboardReport_Data_t;
/* Function Prototypes: */ /* Function Prototypes: */
void SetupHardware(void); void SetupHardware(void);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment