Version 2.9.1: added IRMP logging for XMEGA, corrected timings for FAN protocol

[irmp.git] / irmpconfig.h

diff --git a/irmpconfig.h b/irmpconfig.h
index 218e939a9fda7ce475fbd445f885a6701125157d..3f87fd7dc01ea6f2a32f227470de17f49da2b117 100644 (file)
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -3,10 +3,10 @@
  *\r
  * DO NOT INCLUDE THIS FILE, WILL BE INCLUDED BY IRMP.H!\r
  *\r
- * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de\r
  * Extensions for PIC 12F1820 W.Strobl 2014-07-20\r
  *\r
- * $Id: irmpconfig.h,v 1.117 2014/07/21 08:56:39 fm Exp $\r
+ * $Id: irmpconfig.h,v 1.130 2015/05/28 06:46:49 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
@@ -72,6 +72,7 @@
 #define IRMP_SUPPORT_BOSE_PROTOCOL              0       // BOSE                 >= 10000                 ~150 bytes\r
 #define IRMP_SUPPORT_KATHREIN_PROTOCOL          0       // Kathrein             >= 10000                 ~200 bytes\r
 #define IRMP_SUPPORT_NUBERT_PROTOCOL            0       // NUBERT               >= 10000                  ~50 bytes\r
+#define IRMP_SUPPORT_FAN_PROTOCOL               1       // FAN (ventilator)     >= 10000                  ~50 bytes\r
 #define IRMP_SUPPORT_SPEAKER_PROTOCOL           0       // SPEAKER (~NUBERT)    >= 10000                  ~50 bytes\r
 #define IRMP_SUPPORT_BANG_OLUFSEN_PROTOCOL      0       // Bang & Olufsen       >= 10000                 ~200 bytes\r
 #define IRMP_SUPPORT_RECS80_PROTOCOL            0       // RECS80 (SAA3004)     >= 15000                  ~50 bytes\r
@@ -90,13 +91,15 @@
 #define IRMP_SUPPORT_RCMM_PROTOCOL              0       // RCMM 12,24, or 32    >= 20000                 ~150 bytes\r
 #define IRMP_SUPPORT_LGAIR_PROTOCOL             0       // LG Air Condition     >= 10000                 ~300 bytes\r
 #define IRMP_SUPPORT_SAMSUNG48_PROTOCOL         0       // Samsung48            >= 10000                 ~100 bytes (SAMSUNG must be enabled!)\r
+#define IRMP_SUPPORT_MERLIN_PROTOCOL            0       // Merlin               >= 15000 (better 20000)  ~300 bytes\r
+#define IRMP_SUPPORT_PENTAX_PROTOCOL            0       // Pentax               >= 10000                 ~150 bytes\r
 #define IRMP_SUPPORT_RADIO1_PROTOCOL            0       // RADIO, e.g. TEVION   >= 10000                 ~250 bytes (experimental)\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
- * Change hardware pin here for ATMEL AVR\r
+ * Change hardware pin here for ATMEL ATMega/ATTiny/XMega\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-#if defined (ATMEL_AVR)                                                 // use PB6 as IR input on AVR\r
+#if defined (ATMEL_AVR) || defined (__AVR_XMEGA__)                      // use PB6 as IR input on AVR\r
 #  define IRMP_PORT_LETTER                      B\r
 #  define IRMP_BIT_NUMBER                       6\r
 \r
@@ -105,10 +108,11 @@
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 #elif defined (PIC_C18)                                                 // use RB4 as IR input on PIC (C18 or XC8 compiler)\r
-#if defined(__12F1840)\r
-#  define IRMP_PIN                              RA5                     // on 12F1840 with XC8 compiler\r
-#endif\r
-#  define IRMP_PIN                              PORTBbits.RB4           // PIC C18\r
+#  if defined(__12F1840)\r
+#    define IRMP_PIN                            RA5                     // on 12F1840 with XC8 compiler\r
+#  else\r
+#    define IRMP_PIN                            PORTBbits.RB4           // PIC C18\r
+#  endif\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * Change hardware pin here for PIC CCS compiler\r
@@ -174,4 +178,4 @@
 #  define IRMP_USE_CALLBACK                     0       // 1: use callbacks. 0: do not. default is 0\r
 #endif\r
 \r
-#endif /* _WC_IRMPCONFIG_H_ */\r
+#endif // _IRMPCONFIG_H_\r