Fix accidentally changed code breaking the HID descriptor parser.

[pub/USBasp.git] / Projects / Magstripe / Magstripe.c

diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c
index 5be3449..7b3f0be 100644 (file)
--- a/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@ -99,12 +99,6 @@ void SetupHardware(void)
        /* Hardware Initialization */\r
        Magstripe_Init();\r
        USB_Init();\r
        /* Hardware Initialization */\r
        Magstripe_Init();\r
        USB_Init();\r

-\r
-       /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
-       OCR0A  = ((F_CPU / 64) / 1000);\r
-       TCCR0A = (1 << WGM01);\r
-       TCCR0B = ((1 << CS01) | (1 << CS00));\r
-       TIMSK0 = (1 << OCIE0A);\r

 }\r
 \r
 /** Determines if a card has been inserted, and if so reads in each track's contents into the bit buffers\r
 }\r
 \r
 /** Determines if a card has been inserted, and if so reads in each track's contents into the bit buffers\r


@@ -148,6 +142,8 @@ void ReadMagstripeData(void)
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface);\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
        HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface);\r

+       \r
+       USB_Device_EnableSOFEvents();\r

 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r


@@ -156,8 +152,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);\r
 }\r
 \r
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);\r
 }\r
 \r

-/** Timer 0 CTC ISR, firing once each millisecond to keep track of elapsed idle time in the HID interface. */\r
-ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
+/** Event handler for the USB device Start Of Frame event. */\r
+void EVENT_USB_Device_StartOfFrame(void)\r

 {\r
        HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);\r
 }\r
 {\r
        HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);\r
 }\r


@@ -184,18 +180,18 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
        if ((IsKeyReleaseReport) || (CurrentTrackBuffer == &TrackDataBuffers[TOTAL_TRACKS]))\r
        {\r
                /* No more data to send, or key release report between key presses */\r
        if ((IsKeyReleaseReport) || (CurrentTrackBuffer == &TrackDataBuffers[TOTAL_TRACKS]))\r
        {\r
                /* No more data to send, or key release report between key presses */\r

-               KeyboardReport->KeyCode = KEY_NONE;\r
+               KeyboardReport->KeyCode[0] = KEY_NONE;\r

        }\r
        else if (!(CurrentTrackBuffer->Elements))\r
        {\r
                /* End of current track, send an enter press and change to the next track's buffer */\r
        }\r
        else if (!(CurrentTrackBuffer->Elements))\r
        {\r
                /* End of current track, send an enter press and change to the next track's buffer */\r

-               KeyboardReport->KeyCode = KEY_ENTER;\r
+               KeyboardReport->KeyCode[0] = KEY_ENTER;\r

                CurrentTrackBuffer++;\r
        }\r
        else\r
        {\r
                /* Still data in the current track; convert next bit to a 1 or 0 keypress */\r
                CurrentTrackBuffer++;\r
        }\r
        else\r
        {\r
                /* Still data in the current track; convert next bit to a 1 or 0 keypress */\r

-               KeyboardReport->KeyCode = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0;\r
+               KeyboardReport->KeyCode[0] = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0;\r

        }\r
        \r
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r
        }\r
        \r
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r