Version 2.3.1: changed timer settings for irsnd

[irmp.git] / main.c

diff --git a/main.c b/main.c
index 9877762af07159b06340978ac138ba79c8666b47..dbcd57f548a50f5bfc4b69d8d83923cf05b3463f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * main.c - demo main module to test irmp decoder\r
  *\r
- * Copyright (c) 2009-2011 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2012 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: main.c,v 1.9 2011/04/11 12:54:25 fm Exp $\r
+ * $Id: main.c,v 1.14 2012/05/15 10:25:21 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -16,13 +16,6 @@
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 \r
-#include <inttypes.h>\r
-#include <avr/io.h>\r
-#include <util/delay.h>\r
-#include <avr/pgmspace.h>\r
-#include <avr/interrupt.h>\r
-\r
-#include "irmpconfig.h"\r
 #include "irmp.h"\r
 \r
 #ifndef F_CPU\r
@@ -32,21 +25,43 @@
 void\r
 timer1_init (void)\r
 {\r
-#if defined (__AVR_ATtiny85__)                                      // ATtiny85:\r
-    OCR1A   =  (F_CPU / (2 * F_INTERRUPTS) / 2) - 1;                // compare value: 1/28800 of CPU frequency, presc = 2\r
-    TCCR1   = (1 << CTC1) | (1 << CS11);                            // switch CTC Mode on, set prescaler to 2\r
-#else                                                               // ATmegaXX:\r
-    OCR1A   =  (F_CPU / (2 * F_INTERRUPTS)) - 1;                    // compare value: 1/28800 of CPU frequency\r
-    TCCR1B  = (1 << WGM12) | (1 << CS10);                           // switch CTC Mode on, set prescaler to 1\r
+#if defined (__AVR_ATtiny45__) || defined (__AVR_ATtiny85__)                // ATtiny45 / ATtiny85:\r
+\r
+#if F_CPU >= 16000000L\r
+    OCR1C   =  (F_CPU / F_INTERRUPTS / 8) - 1;                              // compare value: 1/15000 of CPU frequency, presc = 8\r
+    TCCR1   = (1 << CTC1) | (1 << CS12);                                    // switch CTC Mode on, set prescaler to 8\r
+#else\r
+    OCR1C   =  (F_CPU / F_INTERRUPTS / 4) - 1;                              // compare value: 1/15000 of CPU frequency, presc = 4\r
+    TCCR1   = (1 << CTC1) | (1 << CS11) | (1 << CS10);                      // switch CTC Mode on, set prescaler to 4\r
+#endif\r
+\r
+#else                                                                       // ATmegaXX:\r
+    OCR1A   =  (F_CPU / F_INTERRUPTS) - 1;                                  // compare value: 1/15000 of CPU frequency\r
+    TCCR1B  = (1 << WGM12) | (1 << CS10);                                   // switch CTC Mode on, set prescaler to 1\r
 #endif\r
 \r
 #ifdef TIMSK1\r
-    TIMSK1  = 1 << OCIE1A;                                          // OCIE1A: Interrupt by timer compare\r
+    TIMSK1  = 1 << OCIE1A;                                                  // OCIE1A: Interrupt by timer compare\r
+#else\r
+    TIMSK   = 1 << OCIE1A;                                                  // OCIE1A: Interrupt by timer compare\r
+#endif\r
+}\r
+\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * Timer 1 output compare A interrupt service routine, called every 1/15000 sec\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#ifdef TIM1_COMPA_vect                                                      // ATtiny84\r
+ISR(TIM1_COMPA_vect)\r
 #else\r
-    TIMSK   = 1 << OCIE1A;                                          // OCIE1A: Interrupt by timer compare\r
+ISR(TIMER1_COMPA_vect)\r
 #endif\r
+{\r
+  (void) irmp_ISR();                                                        // call irmp ISR\r
+  // call other timer interrupt routines...\r
 }\r
 \r
+\r
 int\r
 main (void)\r
 {\r