X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7ef58eef7a57c46ab53ed8a26805b58dcffd7010..a9e0935a90346beb0c981924becc1f55d969a08b:/Demos/Device/LowLevel/Keyboard/Keyboard.c?ds=sidebyside

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index 33a6d840a..67715843b 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)
-      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
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
+
+  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
@@ -62,6 +62,7 @@ int main(void)
 	SetupHardware();
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+	sei();
 
 	for (;;)
 	{
@@ -258,14 +259,17 @@ 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));
 	
+	/* Make sent key uppercase by indicating that the left shift key is pressed */
+	ReportData->Modifier = KEYBOARD_MODIFER_LEFTSHIFT;
+	
 	if (JoyStatus_LCL & JOY_UP)
 	  ReportData->KeyCode[UsedKeyCodes++] = 0x04; // A
 	else if (JoyStatus_LCL & JOY_DOWN)
@@ -281,15 +285,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.
@@ -300,13 +295,13 @@ void ProcessLEDReport(uint8_t LEDReport)
 {
 	uint8_t LEDMask = LEDS_LED2;
 	
-	if (LEDReport & 0x01) // NUM Lock
+	if (LEDReport & KEYBOARD_LED_NUMLOCK)
 	  LEDMask |= LEDS_LED1;
 	
-	if (LEDReport & 0x02) // CAPS Lock
+	if (LEDReport & KEYBOARD_LED_CAPSLOCK)
 	  LEDMask |= LEDS_LED3;
 
-	if (LEDReport & 0x04) // SCROLL Lock
+	if (LEDReport & KEYBOARD_LED_SCROLLLOCK)
 	  LEDMask |= LEDS_LED4;
 
 	/* Set the status LEDs to the current Keyboard LED status */