X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7ef58eef7a57c46ab53ed8a26805b58dcffd7010..a4ebf4e92061bf1eec9224e64bc823ca7bedada4:/Demos/Device/LowLevel/Keyboard/Keyboard.c diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c index 33a6d840a..28a3d407b 100644 --- a/Demos/Device/LowLevel/Keyboard/Keyboard.c +++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c @@ -1,22 +1,22 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Denver Gingerich (denver [at] ossguy [dot] com) + Copyright 2010 Denver Gingerich (denver [at] ossguy [dot] com) Based on code by Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, provided that the above copyright notice appear in all - copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -258,11 +258,11 @@ void EVENT_USB_Device_StartOfFrame(void) */ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData) { - static uint8_t PrevUsedKeyCodes; - uint8_t UsedKeyCodes = 0; uint8_t JoyStatus_LCL = Joystick_GetStatus(); uint8_t ButtonStatus_LCL = Buttons_GetStatus(); + uint8_t UsedKeyCodes = 0; + /* Clear the report contents */ memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t)); @@ -281,15 +281,6 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData) if (ButtonStatus_LCL & BUTTONS_BUTTON1) ReportData->KeyCode[UsedKeyCodes++] = 0x09; // F - - /* The host will ignore the device if we add a new keycode to the report while another keycode is currently - * being sent (i.e. the user has pressed another key while a key is already being pressed) - we need to intersperse - * the two reports with a zeroed report to force the host to accept the additional keys */ - if (UsedKeyCodes != PrevUsedKeyCodes) - { - memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t)); - PrevUsedKeyCodes = UsedKeyCodes; - } } /** Processes a received LED report, and updates the board LEDs states to match.