X-Git-Url: http://git.kpe.io/?p=avr_serial_lcd.git;a=blobdiff_plain;f=serial_lcd.c;h=bef0e8c463f004adf5e54eed0adaaca9be901741;hp=1235c7ba0c527653ba7284c3a149a9c977940bd5;hb=HEAD;hpb=8147823cf64e37f6f43838ffa9e056ea48e30c32

diff --git a/serial_lcd.c b/serial_lcd.c
index 1235c7b..bef0e8c 100644
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -25,13 +25,13 @@
 #include "serial_lcd.h"
 
 #if defined(__GNUC__)
-FUSES = {
-  .low = SUT1, 
-  .high = (unsigned char) (DWEN & WDTON & RSTDISBL & BODLEVEL1 & BODLEVEL2),
-  .extended = EFUSE_DEFAULT,
-};
+//FUSES = {
+// .low = SUT1,
+    //  .high = (unsigned char) (DWEN & WDTON & RSTDISBL & BODLEVEL1 & BODLEVEL2),
+    //  .extended = EFUSE_DEFAULT,
+    //};
 #endif
-  
+
 // Number of PWM brightness levels supported
 #define LED_BRIGHTNESS_LEVELS 8
 
@@ -40,20 +40,20 @@ FUSES = {
 #define	LCD_ON	0x0C
 // Clear display command
 #define LCD_CLR 0x01
-// Set 4 data bits 
-#define LCD_4_Bit 0x20 
-// Set 8 data bits 
-#define LCD_8_Bit 0x30 
-// Set number of lines 
-#define LCD_4_Line 0x08 
+// Set 4 data bits
+#define LCD_4_Bit 0x20
+// Set 8 data bits
+#define LCD_8_Bit 0x30
+// Set number of lines
+#define LCD_4_Line 0x08
 // Set 8 data bits
 #define	DATA_8	0x30
-// Set character font 
-#define LCD_Font 0x04 
-// Turn the cursor on 
-#define LCD_CURSOR_ON 0x02 
-// Turn on cursor blink 
-#define LCD_CURSOR_BLINK 0x01 
+// Set character font
+#define LCD_Font 0x04
+// Turn the cursor on
+#define LCD_CURSOR_ON 0x02
+// Turn on cursor blink
+#define LCD_CURSOR_BLINK 0x01
 
 ////// Serial command codes ///////
 // ASCII control code to set brightness level
@@ -94,11 +94,6 @@ static FLASH_DECLARE(const unsigned char ledPwmPatterns[]) =
 #pragma global_register ledPwmCount:20 sUartRxHead:21 sUartRxTail:22 ledPwmCycling:23
 unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;
 
-#elif defined(__CODEVISIONAVR__)
-#pragma regalloc-
-register unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;
-#pragma regalloc+
-
 // Use avr_compat register variables
 #else
 REGISTER_VAR(unsigned char ledPwmCount, "r4", 15);
@@ -110,12 +105,12 @@ REGISTER_VAR(unsigned char ledPwmCycling, "r7", 12);
 #define ledPwmPattern GPIOR0
 #if defined(REGISTER_BIT)
 #define BIT_led_on REGISTER_BIT(GPIOR1,0)
-#define BACKLIGHT_STATUS() BIT_led_on
+#define IS_BACKLIGHT_ON() BIT_led_on
 #define BACKLIGHT_OFF() BIT_led_on = 0
 #define BACKLIGHT_ON() BIT_led_on = 1
 #else
-#define BACKLIGHT_STATUS() (GPIOR1 & 0x01)
-#define BACKLIGHT_OFF() GPIOR1 &=~ ~0x01
+#define IS_BACKLIGHT_ON() (GPIOR1 & 0x01)
+#define BACKLIGHT_OFF() GPIOR1 &= ~0x01
 #define BACKLIGHT_ON() GPIOR1 |= 0x01
 #endif
 
@@ -164,7 +159,7 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
   unsigned char ledPwmPos;
 
   if (brightness == 0) { // turn backlight off for 0 brightness
-    if (BACKLIGHT_STATUS()) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStop();
       ledPwmPattern = 0;
       ledPwmCycling = 0;
@@ -183,12 +178,12 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
   ledPwmCycling = ledPwmPattern;
   if (ledPwmPos >= LED_BRIGHTNESS_LEVELS-1) { // maximum brightness
     // don't need PWM for continuously on
-    if (BACKLIGHT_STATUS()) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStop();
       LED_PORT |= (1<<LED_PIN);
     }
   } else {
-    if (BACKLIGHT_STATUS()) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStart();
     }
   }
@@ -263,17 +258,13 @@ static inline void UsartInit(void) {
 #endif
 }
 
-#if defined(__IMAGECRAFT__) || defined(__CODEVISIONAVR__)
+#if defined(__IMAGECRAFT__)
 // Clock cycle = 67nS @ 14.7456MHz
 // Delay resolution ~ 1uS @ 14.7456MHz
 // So this function is only accurate at near above frequency
 void _delay_us (unsigned int d) {
   while (d-- != 0);
-#if defined(__IMAGECRAFT__)
   asm("nop");
-#elif defined(__CODEVISIONAVR__)
-  #asm("nop")
-#endif
 }
 #endif
 
@@ -312,13 +303,15 @@ static inline void LcdInit (void) {
 MAIN_FUNC() {
   MCUSR = 0; // clear all reset flags
 
+  wdt_reset();
 #if defined(__CODEVISIONAVR__)
-      #asm("wdr");
-#else
-      wdt_reset();
+#pragma optsize-
 #endif
   WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
   WDTCSR = (1<<WDE)|(1<<WDP3)|(1<<WDP0); // 1024K cycles, 8.0sec
+#if defined(__CODEVISIONAVR__) && defined(_OPTIMIZE_SIZE_)
+#pragma optsize+
+#endif
   MCUCR &= ~((1<<SM1)|(1<<SM0)); // use idle sleep mode
 
   LedPwmInit ();
@@ -327,11 +320,7 @@ MAIN_FUNC() {
   // Initialize the AVR USART
   UsartInit ();
 
-#if defined(__CODEVISIONAVR__)
-      #asm("sei");
-#else
   sei();
-#endif
   while (1) {
     unsigned char tail = sUartRxTail; // explicitly set order of volatile access
     if (tail != sUartRxHead) { // Check if UART RX buffer has a character
@@ -354,50 +343,38 @@ MAIN_FUNC() {
     } else {
       // No characters waiting in RX buffer
 
-#if defined(__CODEVISIONAVR__)
-      #asm("cli");
-#else
       cli();
-#endif
-#if defined(__CODEVISIONAVR__)
-      #asm("wdr");
-#else
       wdt_reset();
-#endif
       MCUSR &= ~(1<<WDRF); // clear any watchdog interrupt flags
+
+#if defined(__CODEVISIONAVR__)
+#pragma optsize-
+#endif
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
       WDTCSR &= ~(1<<WDE); // watchdog timer off
-#if defined(__CODEVISIONAVR__)
-      #asm("sei");
-#else
-      sei();
+#if defined(__CODEVISIONAVR__) && defined(_OPTIMIZE_SIZE_)
+#pragma optsize+
 #endif
 
+      sei();
+
       sleep_enable();
-#if defined(__CODEVISIONAVR__)
-      #asm("sleep");
-#else
       sleep_cpu();
-#endif
       sleep_disable();
 
-#if defined(__CODEVISIONAVR__)
-      #asm("cli");
-#else
       cli();
-#endif
-#if defined(__CODEVISIONAVR__)
-      #asm("wdr");
-#else
       wdt_reset();
+
+#if defined(__CODEVISIONAVR__)
+#pragma optsize-
 #endif
       WDTCSR |= (1<<WDCE)|(1<<WDE); // start timed sequence (keep old prescaler)
       WDTCSR &= ~(1<<WDCE);
-#if defined(__CODEVISIONAVR__)
-      #asm("sei");
-#else
-      sei();
+#if defined(__CODEVISIONAVR__) && defined(_OPTIMIZE_SIZE_)
+#pragma optsize+
 #endif
+
+      sei();
     }
   }
   MAIN_FUNC_LAST();
@@ -406,36 +383,11 @@ MAIN_FUNC() {
 void LcdWriteCmd (unsigned char Cmd) {
   LcdBusyWait();
   LCD_DATA_PORT = Cmd;  // BusyWait leaves RS low in "Register mode"
-#if defined(__CODEVISIONAVR__)
-  #asm("nop");
-#else
-   NOP();
-#endif
+  NOP();
   LCD_CONTROL_PORT |= (1<<LCD_E);
-#if defined(__CODEVISIONAVR__)
-  #if CONSERVATIVE_ENABLE_DURATION
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #else
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #endif
-#else
   ENABLE_WAIT();
-#endif
   LCD_CONTROL_PORT &= ~(1<<LCD_E);
-#if defined(__CODEVISIONAVR__)
-  #asm("nop");
-#else
-   NOP();
-#endif
+  NOP();
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character mode"
 }
 
@@ -443,30 +395,9 @@ void LcdWriteData (unsigned char c) {
   LcdBusyWait();
   LCD_CONTROL_PORT |= (1<<LCD_RS); // Set display to "Character Mode"
   LCD_DATA_PORT = c;
-#if defined(__CODEVISIONAVR__)
-  #asm("nop");
-#else
-   NOP();
-#endif
+  NOP();
   LCD_CONTROL_PORT |= (1<<LCD_E);
-#if defined(__CODEVISIONAVR__)
-  #if CONSERVATIVE_ENABLE_DURATION
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #else
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #endif
-#else
   ENABLE_WAIT();
-#endif
   LCD_CONTROL_PORT &= ~(1<<LCD_E);
 }
 
@@ -475,36 +406,11 @@ unsigned char LcdBusyWait (void) {
   LCD_DATA_DIR = 0x00; // Set LCD data port to inputs
   LCD_CONTROL_PORT &= ~(1<<LCD_RS); // Set display to "Register mode"
   LCD_CONTROL_PORT |= (1<<LCD_RW); // Put the display in the read mode
-#if defined(__CODEVISIONAVR__)
-  #asm("nop");
-#else
-   NOP();
-#endif
+  NOP();
   do {
-#if defined(__CODEVISIONAVR__)
-      #asm("wdr");
-#else
-      wdt_reset();
-#endif
+    wdt_reset();
     LCD_CONTROL_PORT |= (1<<LCD_E);
-#if defined(__CODEVISIONAVR__)
-  #if CONSERVATIVE_ENABLE_DURATION
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #else
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-    #asm("nop")
-  #endif
-#else
-  ENABLE_WAIT();
-#endif
+    ENABLE_WAIT();
     LCDStatus = LCD_DATA_PIN_REG;
     LCD_CONTROL_PORT &= ~(1<<LCD_E);
   } while (LCDStatus & (1<<LCD_BUSY));
@@ -513,16 +419,24 @@ unsigned char LcdBusyWait (void) {
   return (LCDStatus);
 }
 
-#if defined(__IMAGECRAFT__)
-#pragma interrupt_handler usart_rx_handler:iv_USART0_RXC
-void usart_rx_handler(void)
-#else
-ISR(USART_RX_vect)
+INLINE_FUNC_DECLARE(static void UartStoreRx (uint8_t rx));
+static inline void UartStoreRx (uint8_t rx) {
+  unsigned char tmphead;
+
+  if (UCSRA & (1<<FE)) {
+    // framing error. Currrently, this is silently ignored
+    // real applications may wish to output information to LCD to indicate
+    // erroroneous byte received
+    return;
+  }
+#ifdef HANDLE_DATA_OVER_RUN_ERROR
+  if (UCSRA & (1<<DOR)) {
+    // some applications may benefit from addind error notification for serial port data overruns
+  }
 #endif
-{
-  unsigned char rx = UDR;
+
   // Calculate next buffer position.
-  unsigned char tmphead = sUartRxHead;
+  tmphead = sUartRxHead;
   if (tmphead == UART_RX_BUFFER_SIZE-1)
     tmphead = 0;
   else
@@ -548,27 +462,29 @@ ISR(USART_RX_vect)
 #endif
 }
 
+#if defined(__IMAGECRAFT__)
+#pragma interrupt_handler usart_rx_handler:iv_USART0_RXC
+void usart_rx_handler(void)
+#else
+ISR(USART_RX_vect)
+#endif
+{
+  UartStoreRx(UDR);
+}
+
 static unsigned char WaitRxChar (void) {
   // waits for next RX character, then return it
   unsigned char tail;
   do {
     tail = sUartRxTail; // explicitly set order of volatile variable access
-#if defined(__CODEVISIONAVR__)
-      #asm("wdr");
-#else
-      wdt_reset();
-#endif
+    wdt_reset();
   } while (sUartRxHead == tail); // while buffer is empty
 
 #if USE_CTS
   // turn off interrupts so that if UART char ready to be stored, then storage
   // will occur after CTS pin is set active. This allows UART ISR to set
-  //  CTS inactive if byte fills buffer after we remove current byte
-#if defined(__CODEVISIONAVR__)
-  #asm("cli");
-#else
+  // CTS inactive if byte fills buffer after we remove current byte
   cli();
-#endif
 #endif
 
   // increment tail position
@@ -579,11 +495,7 @@ static unsigned char WaitRxChar (void) {
 
 #if USE_CTS
   CTS_PORT |= (1<<CTS_PIN); // Ensure CTS is active since just removed a byte
-#if defined(__CODEVISIONAVR__)
-  #asm("sei");
-#else
   sei();   // Allow UART ISR to read character and change potentially change CTS
-#endif
 #endif
 
   return sUartRxBuf[sUartRxTail];
@@ -592,17 +504,11 @@ static unsigned char WaitRxChar (void) {
 #if defined(__IMAGECRAFT__)
 #pragma interrupt_handler timer0_compa_handler:iv_TIMER0_COMPA
 void timer0_compa_handler(void)
-#elif defined(__CODEVISIONAVR__)
-interrupt [TIM0_COMPA] void timer0_compa_handler(void)
 #else
   ISR(TIMER0_COMPA_vect)
 #endif
 {
-#if defined(__CODEVISIONAVR__)
-  #asm("sei");
-#else
   sei(); // Okay to allow USART interrupts while controlling LED PWM
-#endif
 
   // Set current LED state based on cycling variable
   if (ledPwmCycling & 0x01) {