X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/bd3f6794dd95c8a8895b3cf25de3332bda603241..c757acf1f7f3f45522024af7adf8df71a42a1dc1:/Projects/SerialToLCD/SerialToLCD.c

diff --git a/Projects/SerialToLCD/SerialToLCD.c b/Projects/SerialToLCD/SerialToLCD.c
index 59522b351..385bcdee3 100644
--- a/Projects/SerialToLCD/SerialToLCD.c
+++ b/Projects/SerialToLCD/SerialToLCD.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
   Copyright 2012  Simon Foster (simon.foster [at] inbox [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
@@ -19,7 +19,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
@@ -83,7 +83,7 @@ int main(void)
 
 	RingBuffer_InitBuffer(&FromHost_Buffer, FromHost_Buffer_Data, sizeof(FromHost_Buffer_Data));
 
-	sei();
+	GlobalInterruptEnable();
 
 	for (;;)
 	{
@@ -99,27 +99,28 @@ int main(void)
 
 		while (RingBuffer_GetCount(&FromHost_Buffer) > 0)
 		{
-			static uint8_t escape_pending = 0;
+			static uint8_t EscapePending = 0;
 			int16_t HD44780Byte = RingBuffer_Remove(&FromHost_Buffer);
 			
 			if (HD44780Byte == COMMAND_ESCAPE)
 			{
-				if (escape_pending)
+				if (EscapePending)
 				{
 					HD44780_WriteData(HD44780Byte);
-					escape_pending = 0;
+					EscapePending = 0;
 				}
 				else
 				{
-					escape_pending = 1;
+					/* Next received character is the command byte */
+					EscapePending = 1;
 				}
 			}
 			else
 			{
-				if (escape_pending)
+				if (EscapePending)
 				{
 					HD44780_WriteCommand(HD44780Byte);
-					escape_pending = 0;
+					EscapePending = 0;
 				}
 				else
 				{
@@ -147,7 +148,7 @@ void SetupHardware(void)
 	USB_Init();
 
 	/* Power up the HD44780 Interface */
-	HD44780_Initialise();
+	HD44780_Initialize();
 	HD44780_WriteCommand(CMD_DISPLAY_ON);
 	
 	/* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
@@ -157,9 +158,7 @@ void SetupHardware(void)
 /** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
-	bool ConfigSuccess = true;
-
-	ConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+	CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
 }
 
 /** Event handler for the library USB Control Request reception event. */