X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..f555ad7ced743a19eb1eefaf5eaf536fcbe58d80:/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index 3ef4640c6..8d7fa93c2 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -152,14 +152,23 @@ int main(void)
 								char PressedKey = 0;
 
 								/* Convert scan-code to printable character if alphanumeric */
-								if ((KeyCode >= 0x04) && (KeyCode <= 0x1D))
-								  PressedKey = (KeyCode - 0x04) + 'A';
-								else if ((KeyCode >= 0x1E) && (KeyCode <= 0x27))
-								  PressedKey = (KeyCode - 0x1E) + '0';
-								else if (KeyCode == 0x2C)
-								  PressedKey = ' ';
-								else if (KeyCode == 0x28)
-								  PressedKey = '\n';
+								if ((KeyCode >= HID_KEYBOARD_SC_A) && (KeyCode <= HID_KEYBOARD_SC_Z))
+								{
+									PressedKey = (KeyCode - HID_KEYBOARD_SC_A) + 'A';
+								}
+								else if ((KeyCode >= HID_KEYBOARD_SC_1_AND_EXCLAMATION) &
+										 (KeyCode <= HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS))
+								{
+									PressedKey = (KeyCode - HID_KEYBOARD_SC_1_AND_EXCLAMATION) + '0';
+								}
+								else if (KeyCode == HID_KEYBOARD_SC_SPACE)
+								{
+									PressedKey = ' ';
+								}
+								else if (KeyCode == HID_KEYBOARD_SC_ENTER)
+								{
+									PressedKey = '\n';
+								}
 
 								/* Print the pressed key character out through the serial port if valid */
 								if (PressedKey)