X-Git-Url: http://git.kpe.io/?p=avr_serial_lcd.git;a=blobdiff_plain;f=serial_lcd.c;h=bef0e8c463f004adf5e54eed0adaaca9be901741;hp=0c8bb10aa85dd36c288d89cb41e623a00e9a65bb;hb=HEAD;hpb=90c5c097702cec99a4e16e2f390325469bb7bf0a

diff --git a/serial_lcd.c b/serial_lcd.c
index 0c8bb10..bef0e8c 100644
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -11,8 +11,9 @@
 **
 ** Compilers supported:
 **   - WinAVR-20071221 (includes avr-libc 1.6 required for proper _delay_us)
-**   - IAR AVR 4.30
-**   - Imagecraft AVR 7
+**   - IAR AVR 4.30 and 5.10
+**   - Imagecraft AVR 7.16
+**   - Codevision AVR 2.02.06
 **
 ** LICENSE
 **   See accompaning LICENSE file
@@ -24,11 +25,11 @@
 #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
@@ -39,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
@@ -93,6 +94,7 @@ static FLASH_DECLARE(const unsigned char ledPwmPatterns[]) =
 #pragma global_register ledPwmCount:20 sUartRxHead:21 sUartRxTail:22 ledPwmCycling:23
 unsigned char ledPwmCount, sUartRxHead, sUartRxTail, ledPwmCycling;
 
+// Use avr_compat register variables
 #else
 REGISTER_VAR(unsigned char ledPwmCount, "r4", 15);
 REGISTER_VAR(unsigned char sUartRxHead, "r5", 14);
@@ -101,8 +103,16 @@ REGISTER_VAR(unsigned char ledPwmCycling, "r7", 12);
 #endif
 
 #define ledPwmPattern GPIOR0
-#define ledStatus GPIOR1
+#if defined(REGISTER_BIT)
 #define BIT_led_on REGISTER_BIT(GPIOR1,0)
+#define IS_BACKLIGHT_ON() BIT_led_on
+#define BACKLIGHT_OFF() BIT_led_on = 0
+#define BACKLIGHT_ON() BIT_led_on = 1
+#else
+#define IS_BACKLIGHT_ON() (GPIOR1 & 0x01)
+#define BACKLIGHT_OFF() GPIOR1 &= ~0x01
+#define BACKLIGHT_ON() GPIOR1 |= 0x01
+#endif
 
 // Function declarations
 void LcdWriteCmd (unsigned char);
@@ -110,8 +120,8 @@ void LcdWriteData (unsigned char);
 unsigned char LcdBusyWait (void);
 static unsigned char WaitRxChar (void);
 
-// ImageCraft doesn't support inline functions, so use preprocessor
-#if defined(__IMAGECRAFT__)
+// ImageCraft/Codevision don't support inline functions, so use preprocessor
+#if defined(__IMAGECRAFT__) || defined(__CODEVISIONAVR__)
 #define LedTimerStop() TCCR0B = 0
 // Start with 256 prescaler
 #define LedTimerStart() TCCR0B = (1<<CS02)
@@ -139,7 +149,7 @@ static inline void LedPwmInit (void) {
   TIMSK = (1<<OCIE0A);  // Turn on timer0 COMPA intr (all other timer intr off)
   LED_PORT &= ~(1<<LED_PIN); // Ensure LED is off during initialization
   LED_DIR |= (1<<LED_PIN);   // Ensure LED is output direction
-  BIT_led_on = 0;       // note that LED is off
+  BACKLIGHT_OFF();       // note that LED is off
   ledPwmPattern = 0xFF; // maximum brightness
 }
 
@@ -149,7 +159,7 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
   unsigned char ledPwmPos;
 
   if (brightness == 0) { // turn backlight off for 0 brightness
-    if (BIT_led_on) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStop();
       ledPwmPattern = 0;
       ledPwmCycling = 0;
@@ -158,7 +168,7 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
     return;
   }
 
-  ledPwmPos = (brightness * (LED_BRIGHTNESS_LEVELS-1) + 127) >> 8;
+  ledPwmPos = (brightness * (LED_BRIGHTNESS_LEVELS-1) + (unsigned int) 127) >> 8;
   // Below is probably not required, but ensures we don't exceed array
   if (ledPwmPos > LED_BRIGHTNESS_LEVELS - 1)
     ledPwmPos = LED_BRIGHTNESS_LEVELS - 1;
@@ -168,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 (BIT_led_on) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStop();
       LED_PORT |= (1<<LED_PIN);
     }
   } else {
-    if (BIT_led_on) {
+    if (IS_BACKLIGHT_ON()) {
       LedTimerStart();
     }
   }
@@ -182,13 +192,13 @@ static inline void LedPwmSetBrightness (unsigned char brightness) {
 INLINE_FUNC_DECLARE(static void LedPwmSwitchOff (void));
 static inline void LedPwmSwitchOff (void) {
   LED_PORT &= ~(1<<LED_PIN);
-  BIT_led_on = 0;
+  BACKLIGHT_OFF();
   LedTimerStop();
 }
 
 INLINE_FUNC_DECLARE(static void LedPwmSwitchOn (void));
 static inline void LedPwmSwitchOn (void) {
-  BIT_led_on = 1;
+  BACKLIGHT_ON();
   if (ledPwmPattern == 0xFF) { // maximum brightness, no need for PWM
     LedTimerStop();
     LED_PORT |= (1<<LED_PIN); // keep LED on at all times
@@ -294,8 +304,14 @@ MAIN_FUNC() {
   MCUSR = 0; // clear all reset flags
 
   wdt_reset();
+#if defined(__CODEVISIONAVR__)
+#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 ();
@@ -330,8 +346,16 @@ MAIN_FUNC() {
       cli();
       wdt_reset();
       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__) && defined(_OPTIMIZE_SIZE_)
+#pragma optsize+
+#endif
+
       sei();
 
       sleep_enable();
@@ -340,8 +364,16 @@ MAIN_FUNC() {
 
       cli();
       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__) && defined(_OPTIMIZE_SIZE_)
+#pragma optsize+
+#endif
+
       sei();
     }
   }
@@ -387,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
@@ -422,6 +462,16 @@ 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;
@@ -433,7 +483,7 @@ static unsigned char WaitRxChar (void) {
 #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
+  // CTS inactive if byte fills buffer after we remove current byte
   cli();
 #endif