diff options
author | ukw | 2015-05-21 06:19:12 +0000 |
---|---|---|
committer | ukw | 2015-05-21 06:19:12 +0000 |
commit | ea58578392acf3be0f6dbe8d77289851ec940a36 (patch) | |
tree | 8eeb95de2f7ae16985a830996d7d8490e1e24842 | |
parent | c495747931de995844cc21ae5ba0feb1b1047a5e (diff) | |
download | irmp-ea58578392acf3be0f6dbe8d77289851ec940a36.zip |
Version 2.8.4: minor corrections of AVR XMEGA port
git-svn-id: svn://mikrocontroller.net/irmp@158 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
-rw-r--r-- | README.txt | 4 | ||||
-rw-r--r-- | irsnd.c | 26 |
2 files changed, 15 insertions, 15 deletions
@@ -1,8 +1,8 @@ IRMP - Infrared Multi Protocol Decoder
--------------------------------------
-Version IRMP: 2.8.3 18.05.2015
-Version IRSND: 2.8.3 18.05.2015
+Version IRMP: 2.8.4 21.05.2015
+Version IRSND: 2.8.4 21.05.2015
Dokumentation:
@@ -13,7 +13,7 @@ * ATmega164, ATmega324, ATmega644, ATmega644P, ATmega1284, ATmega1284P
* ATmega88, ATmega88P, ATmega168, ATmega168P, ATmega328P
*
- * $Id: irsnd.c,v 1.86 2015/05/07 06:51:10 fm Exp $
+ * $Id: irsnd.c,v 1.87 2015/05/21 06:17:31 fm Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -459,18 +459,18 @@ irsnd_on (void) TIM_Cmd(IRSND_TIMER, ENABLE); // enable counter
# elif defined (__AVR_XMEGA__)
-# if (IRSND_OCx == IRSND_XMEGA_OC0A) // use OC0A
- XMEGA_Timer.CTRLB |= (1<<TC0_CCAEN_bp); // Compare A
-# elif (IRSND_OCx == IRSND_XMEGA_OC0B) // use OC0B
- XMEGA_Timer.CTRLB |= (1<<TC0_CCBEN_bp); // Compare B
-# elif IRSND_OCx == IRSND_XMEGA_OC0C // use OC0C
- XMEGA_Timer.CTRLB |= (1<<TC0_CCCEN_bp); // Compare C
-# elif IRSND_OCx == IRSND_XMEGA_OC0D // use OC0D
- XMEGA_Timer.CTRLB |= (1<<TC0_CCDEN_bp); // Compare D
-# elif IRSND_OCx == IRSND_XMEGA_OC0C // use OC1C
- XMEGA_Timer.CTRLB |= (1<<TC1_CCAEN_bp); // Compare A
-# elif IRSND_OCx == IRSND_XMEGA_OC0D // use OC1D
- XMEGA_Timer.CTRLB |= (1<<TC1_CCBEN_bp); // Compare B
+# if (IRSND_OCx == IRSND_XMEGA_OC0A) // use OC0A
+ XMEGA_Timer.CTRLB |= (1<<TC0_CCAEN_bp); // Compare A
+# elif (IRSND_OCx == IRSND_XMEGA_OC0B) // use OC0B
+ XMEGA_Timer.CTRLB |= (1<<TC0_CCBEN_bp); // Compare B
+# elif IRSND_OCx == IRSND_XMEGA_OC0C // use OC0C
+ XMEGA_Timer.CTRLB |= (1<<TC0_CCCEN_bp); // Compare C
+# elif IRSND_OCx == IRSND_XMEGA_OC0D // use OC0D
+ XMEGA_Timer.CTRLB |= (1<<TC0_CCDEN_bp); // Compare D
+# elif IRSND_OCx == IRSND_XMEGA_OC1A // use OC1A
+ XMEGA_Timer.CTRLB |= (1<<TC1_CCAEN_bp); // Compare A
+# elif IRSND_OCx == IRSND_XMEGA_OC1B // use OC1B
+ XMEGA_Timer.CTRLB |= (1<<TC1_CCBEN_bp); // Compare B
# else
# error wrong value of IRSND_OCx
# endif // IRSND_OCx
|