X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..064643e06648dcb7e4d03bd2c2029b9186c250b5:/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
index bdf4a2830..512cc1ae2 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/LowLevel/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.fourwalledcubicle.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
@@ -66,9 +66,12 @@ void SetupHardware(void)
 	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
-	SerialStream_Init(9600, false);
+	Serial_Init(9600, false);
 	LEDs_Init();
 	USB_Init();
+
+	/* Create a stdio stream for the serial port for stdin and stdout */
+	Serial_CreateStream(NULL);
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
@@ -100,7 +103,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
-	USB_ShutDown();
+	USB_Disable();
 
 	printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
 	                         " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
@@ -225,7 +228,7 @@ void Keyboard_HID_Task(void)
 					uint8_t KeyboardReport[Pipe_BytesInPipe()];
 
 					/* Load in the keyboard report */
-					Pipe_Read_Stream_LE(KeyboardReport, Pipe_BytesInPipe());
+					Pipe_Read_Stream_LE(KeyboardReport, Pipe_BytesInPipe(), NULL);
 
 					/* Process the read in keyboard report from the device */
 					ProcessKeyboardReport(KeyboardReport);
@@ -278,15 +281,24 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
 
 				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';
+				/* Retrieve pressed key character if alphanumeric */
+				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)