Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Demos / Device / LowLevel / Keyboard / Keyboard.c

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index 33a6d84..6771584 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -1,22 +1,22 @@
 /*\r
              LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
-  Copyright 2009  Denver Gingerich (denver [at] ossguy [dot] com)\r
-      Based on code by Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
@@ -62,6 +62,7 @@ int main(void)
        SetupHardware();\r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       sei();\r
 \r
        for (;;)\r
        {\r
@@ -258,14 +259,17 @@ void EVENT_USB_Device_StartOfFrame(void)
  */\r
 void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)\r
 {\r
-       static uint8_t PrevUsedKeyCodes;\r
-       uint8_t UsedKeyCodes      = 0;\r
        uint8_t JoyStatus_LCL     = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL  = Buttons_GetStatus();\r
 \r
+       uint8_t UsedKeyCodes      = 0;\r
+\r
        /* Clear the report contents */\r
        memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));\r
        \r
+       /* Make sent key uppercase by indicating that the left shift key is pressed */\r
+       ReportData->Modifier = KEYBOARD_MODIFER_LEFTSHIFT;\r
+       \r
        if (JoyStatus_LCL & JOY_UP)\r
          ReportData->KeyCode[UsedKeyCodes++] = 0x04; // A\r
        else if (JoyStatus_LCL & JOY_DOWN)\r
@@ -281,15 +285,6 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
          ReportData->KeyCode[UsedKeyCodes++] = 0x09; // F\r
-       \r
-       /* The host will ignore the device if we add a new keycode to the report while another keycode is currently\r
-        * being sent (i.e. the user has pressed another key while a key is already being pressed) - we need to intersperse\r
-        * the two reports with a zeroed report to force the host to accept the additional keys */\r
-       if (UsedKeyCodes != PrevUsedKeyCodes)\r
-       {\r
-               memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));\r
-               PrevUsedKeyCodes = UsedKeyCodes;\r
-       }\r
 }\r
 \r
 /** Processes a received LED report, and updates the board LEDs states to match.\r
@@ -300,13 +295,13 @@ void ProcessLEDReport(uint8_t LEDReport)
 {\r
        uint8_t LEDMask = LEDS_LED2;\r
        \r
-       if (LEDReport & 0x01) // NUM Lock\r
+       if (LEDReport & KEYBOARD_LED_NUMLOCK)\r
          LEDMask |= LEDS_LED1;\r
        \r
-       if (LEDReport & 0x02) // CAPS Lock\r
+       if (LEDReport & KEYBOARD_LED_CAPSLOCK)\r
          LEDMask |= LEDS_LED3;\r
 \r
-       if (LEDReport & 0x04) // SCROLL Lock\r
+       if (LEDReport & KEYBOARD_LED_SCROLLLOCK)\r
          LEDMask |= LEDS_LED4;\r
 \r
        /* Set the status LEDs to the current Keyboard LED status */\r