Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.

[pub/USBasp.git] / Projects / SerialToLCD / SerialToLCD.c

diff --git a/Projects/SerialToLCD/SerialToLCD.c b/Projects/SerialToLCD/SerialToLCD.c
index 7a28927..21f3e4a 100644 (file)
--- a/Projects/SerialToLCD/SerialToLCD.c
+++ b/Projects/SerialToLCD/SerialToLCD.c
@@ -33,31 +33,6 @@
  *
  *  Main source file for the SerialToLCD program. This file contains the main tasks of
  *  the project and is responsible for the initial application hardware configuration.
- *    
- *  \section Hardware Information
- *
- *    LCD Datasheet:  See http://www.sparkfun.com/datasheets/LCD/HD44780.pdf
- *   
- *   Also see the two articles from EPE which are linked from here:
- *   http://en.wikipedia.org/wiki/HD44780_Character_LCD
- *
- *   Connections from the Minimus to the HD44780 as shown below.
- *   
- *   =========================================================  \n
- *   Minimus                 HD44780     Pin                    \n
- *   =========================================================  \n
- *   PD0                     DB4         11                     \n
- *   PD1                     DB5         12                     \n
- *   PD2                     DB6         13                     \n
- *   PD3                     DB7         14                     \n
- *                                                              \n
- *   PD4                     RS          4                      \n
- *                           RW          5       GND            \n
- *   PD7                     EN          6                      \n
- *                                                              \n
- *                                       1       GND            \n
- *                                       2       USB +5V        \n
- *                                       3       2k -> GND      \n
  */
 
 #include "SerialToLCD.h"
@@ -108,7 +83,7 @@ int main(void)
 
        RingBuffer_InitBuffer(&FromHost_Buffer, FromHost_Buffer_Data, sizeof(FromHost_Buffer_Data));
 
-       sei();
+       GlobalInterruptEnable();
 
        for (;;)
        {
@@ -124,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
                                {
@@ -172,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 */
@@ -182,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. */