]> cloudbase.mooo.com Git - irmp.git/commitdiff
Version 2.8.4: minor corrections of AVR XMEGA port
authorukw <ukw@aeb2e35e-bfc4-4214-b83c-9e8de998ed28>
Thu, 21 May 2015 06:19:12 +0000 (06:19 +0000)
committerukw <ukw@aeb2e35e-bfc4-4214-b83c-9e8de998ed28>
Thu, 21 May 2015 06:19:12 +0000 (06:19 +0000)
git-svn-id: svn://mikrocontroller.net/irmp@158 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

README.txt
irsnd.c

index 04fd0498929e3f40460672bdda9e2a0459496405..33059d916633c4f60163ab71d90c86c61a465837 100644 (file)
@@ -1,8 +1,8 @@
 IRMP - Infrared Multi Protocol Decoder\r
 --------------------------------------\r
 \r
-Version IRMP:  2.8.3 18.05.2015\r
-Version IRSND: 2.8.3 18.05.2015\r
+Version IRMP:  2.8.4 21.05.2015\r
+Version IRSND: 2.8.4 21.05.2015\r
 \r
 Dokumentation:\r
  \r
diff --git a/irsnd.c b/irsnd.c
index a45fc426893528ff8d3374585a8f3fd08783d632..a802e99ea4ffb530e5e3dd706970da6c4f0c1362 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -13,7 +13,7 @@
  * ATmega164, ATmega324, ATmega644,  ATmega644P, ATmega1284, ATmega1284P\r
  * ATmega88,  ATmega88P, ATmega168,  ATmega168P, ATmega328P\r
  *\r
- * $Id: irsnd.c,v 1.86 2015/05/07 06:51:10 fm Exp $\r
+ * $Id: irsnd.c,v 1.87 2015/05/21 06:17:31 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
@@ -459,18 +459,18 @@ irsnd_on (void)
         TIM_Cmd(IRSND_TIMER, ENABLE);                   // enable counter\r
 \r
 #  elif defined (__AVR_XMEGA__) \r
-#    if (IRSND_OCx == IRSND_XMEGA_OC0A)                                                                                                 // use OC0A\r
-        XMEGA_Timer.CTRLB |= (1<<TC0_CCAEN_bp);                                         // Compare A \r
-#    elif (IRSND_OCx == IRSND_XMEGA_OC0B)                                                                                               // use OC0B\r
-        XMEGA_Timer.CTRLB |= (1<<TC0_CCBEN_bp);                                         // Compare B \r
-#    elif IRSND_OCx == IRSND_XMEGA_OC0C                                                 // use OC0C\r
-        XMEGA_Timer.CTRLB |= (1<<TC0_CCCEN_bp);                                         // Compare C\r
-#    elif IRSND_OCx == IRSND_XMEGA_OC0D                                                 // use OC0D\r
-        XMEGA_Timer.CTRLB |= (1<<TC0_CCDEN_bp);                                         // Compare D\r
-#    elif IRSND_OCx == IRSND_XMEGA_OC0C                                                 // use OC1C\r
-                XMEGA_Timer.CTRLB |= (1<<TC1_CCAEN_bp);                                                                                 // Compare A\r
-#    elif IRSND_OCx == IRSND_XMEGA_OC0D                                                 // use OC1D\r
-                XMEGA_Timer.CTRLB |= (1<<TC1_CCBEN_bp);                                                                                 // Compare B\r
+#    if (IRSND_OCx == IRSND_XMEGA_OC0A)                                 // use OC0A\r
+                XMEGA_Timer.CTRLB |= (1<<TC0_CCAEN_bp);                 // Compare A \r
+#    elif (IRSND_OCx == IRSND_XMEGA_OC0B)                               // use OC0B\r
+                XMEGA_Timer.CTRLB |= (1<<TC0_CCBEN_bp);                 // Compare B \r
+#    elif IRSND_OCx == IRSND_XMEGA_OC0C                                 // use OC0C\r
+                XMEGA_Timer.CTRLB |= (1<<TC0_CCCEN_bp);                 // Compare C\r
+#    elif IRSND_OCx == IRSND_XMEGA_OC0D                                 // use OC0D\r
+                XMEGA_Timer.CTRLB |= (1<<TC0_CCDEN_bp);                 // Compare D\r
+#    elif IRSND_OCx == IRSND_XMEGA_OC1A                                 // use OC1A\r
+                XMEGA_Timer.CTRLB |= (1<<TC1_CCAEN_bp);                 // Compare A\r
+#    elif IRSND_OCx == IRSND_XMEGA_OC1B                                 // use OC1B\r
+                XMEGA_Timer.CTRLB |= (1<<TC1_CCBEN_bp);                 // Compare B\r
 #    else\r
 #       error wrong value of IRSND_OCx\r
 #    endif // IRSND_OCx\r