Version 2.3.1: changed timer settings for irsnd

git-svn-id: svn://mikrocontroller.net/irmp@106 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

diff --git a/README.txt b/README.txt
index cfe134bbe4361fffcd221c1248f5d1e69ba0b0bb..354a56b40745f0743b8c8aee5fd121b4b5f2767e 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ IRMP - Infrared Multi Protocol Decoder
 --------------------------------------\r
 \r
 Version IRMP:  2.3.1 26.10.2012\r
-Version IRSND: 2.3.1 26.10.2012\r
+Version IRSND: 2.3.2 29.10.2012\r
 \r
 Dokumentation:\r
  \r

diff --git a/irsnd.c b/irsnd.c
index 30dd5af91c97b046336b619379adb11271bf46dc..1c8613a4fc80a941299d1d9f7e4bd9c08382a807 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -13,7 +13,7 @@
  * ATmega164, ATmega324, ATmega644,  ATmega644P, ATmega1284\r
  * ATmega88,  ATmega88P, ATmega168,  ATmega168P, ATmega328P\r
  *\r
- * $Id: irsnd.c,v 1.62 2012/10/26 08:20:30 fm Exp $\r
+ * $Id: irsnd.c,v 1.63 2012/10/29 10:03:34 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -609,9 +609,9 @@ irsnd_init (void)
 #    elif IRSND_OCx == IRSND_OC2A || IRSND_OCx == IRSND_OC2B                        // use OC2A or OC2B\r
         TCCR2A = (1<<WGM21);                                                        // CTC mode\r
 #       if AVR_PRESCALER == 8\r
-          TCCR2B |= (1<<CS21);                                                      // start Timer 2, prescaler = 8\r
+          TCCR2B = (1<<CS21);                                                       // start Timer 2, prescaler = 8\r
 #       else\r
-          TCCR2B |= (1<<CS20);                                                      // start Timer 2, prescaler = 1\r
+          TCCR2B = (1<<CS20);                                                       // start Timer 2, prescaler = 1\r
 #       endif\r
 #    elif IRSND_OCx == IRSND_OC0                                                    // use OC0\r
         TCCR0 = (1<<WGM01);                                                         // CTC mode\r
@@ -623,9 +623,9 @@ irsnd_init (void)
 #    elif IRSND_OCx == IRSND_OC0A || IRSND_OCx == IRSND_OC0B                        // use OC0A or OC0B\r
         TCCR0A = (1<<WGM01);                                                        // CTC mode\r
 #       if AVR_PRESCALER == 8\r
-          TCCR0B |= (1<<CS01);                                                      // start Timer 0, prescaler = 8\r
+          TCCR0B = (1<<CS01);                                                       // start Timer 0, prescaler = 8\r
 #       else\r
-          TCCR0B |= (1<<CS00);                                                      // start Timer 0, prescaler = 1\r
+          TCCR0B = (1<<CS00);                                                       // start Timer 0, prescaler = 1\r
 #       endif\r
 #    else\r
 #      error wrong value of IRSND_OCx\r