Removed code to zero reports between two keyboard reports with differing number of...

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 2918f5a..002d24a 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -144,7 +144,6 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 \r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 \r

-       static uint8_t PrevUsedKeyCodes;\r

        uint8_t UsedKeyCodes = 0;\r
        \r
        if (JoyStatus_LCL & JOY_UP)\r
        uint8_t UsedKeyCodes = 0;\r
        \r
        if (JoyStatus_LCL & JOY_UP)\r


@@ -162,15 +161,6 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
          KeyboardReport->KeyCode[UsedKeyCodes++] = 0x09; // F\r
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
          KeyboardReport->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(KeyboardReport, sizeof(USB_KeyboardReport_Data_t), 0x00);\r
-               PrevUsedKeyCodes = UsedKeyCodes;\r
-       }\r

 \r
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r
        return false;\r
 \r
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);\r
        return false;\r

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index 33a6d84..4e7921f 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -258,11 +258,11 @@ void EVENT_USB_Device_StartOfFrame(void)
  */\r
 void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)\r
 {\r
  */\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 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
        /* Clear the report contents */\r
        memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));\r
        \r


@@ -281,15 +281,6 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)
          \r
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)\r
          ReportData->KeyCode[UsedKeyCodes++] = 0x09; // F\r
          \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
 }\r
 \r
 /** Processes a received LED report, and updates the board LEDs states to match.\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index c6ed0ee..28c2a29 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -8,7 +8,12 @@
   *\r
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX\r
   *\r
   *\r
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX\r
   *\r

-  *  <b>There is no changelog information for this version.</b>\r
+  *  <b>New:</b>\r
+  *  - Added activity LED indicators to the AVRISP project to indicate when the device is busy processing a command\r
+  *\r
+  *  <b>Changed:</b>\r
+  *  - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes\r
+  *    as this relied on non-standard OS driver behaviour to repeat key groups\r

   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r
   *\r
   *  \section Sec_ChangeLog091122 Version 091122\r
   *\r