Version 2.9.2: added S100 protocol, some minor corrections

[irmp.git] / irsndconfig.h

diff --git a/irsndconfig.h b/irsndconfig.h
index 97d1d355f7d9440dab10457e972615c11485276f..e661f3749eac9452f9ce2285cb22d1d4aba5aaff 100644 (file)
--- a/irsndconfig.h
+++ b/irsndconfig.h
@@ -3,11 +3,9 @@
  *\r
  * DO NOT INCLUDE THIS FILE, WILL BE INCLUDED BY IRSND.H!\r
  *\r
- * Copyright (c) 2010-2014 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2010-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsndconfig.h,v 1.62 2014/07/21 08:56:39 fm Exp $\r
- *\r
- * ATMEGA88 @ 8 MHz\r
+ * $Id: irsndconfig.h,v 1.73 2015/05/29 08:24:37 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
@@ -64,6 +62,7 @@
 // exotic protocols, enable here!               Enable  Remarks                 F_INTERRUPTS            Program Space\r
 #define IRSND_SUPPORT_KATHREIN_PROTOCOL         0       // Kathrein             >= 10000                 DON'T CHANGE, NOT SUPPORTED YET!\r
 #define IRSND_SUPPORT_NUBERT_PROTOCOL           0       // NUBERT               >= 10000                 ~100 bytes\r
+#define IRSND_SUPPORT_FAN_PROTOCOL              1       // FAN (ventilator)     >= 10000                 ~100 bytes\r
 #define IRSND_SUPPORT_SPEAKER_PROTOCOL          0       // SPEAKER              >= 10000                 ~100 bytes\r
 #define IRSND_SUPPORT_BANG_OLUFSEN_PROTOCOL     0       // Bang&Olufsen         >= 10000                 ~250 bytes\r
 #define IRSND_SUPPORT_RECS80_PROTOCOL           0       // RECS80               >= 15000                 ~100 bytes\r
@@ -82,9 +81,28 @@
 #define IRSND_SUPPORT_RCMM_PROTOCOL             0       // RCMM 12,24, or 32    >= 20000                 DON'T CHANGE, NOT SUPPORTED YET!\r
 #define IRSND_SUPPORT_LGAIR_PROTOCOL            0       // LG Air Condition     >= 10000                 ~150 bytes.\r
 #define IRSND_SUPPORT_SAMSUNG48_PROTOCOL        0       // Samsung48            >= 10000                 ~100 bytes\r
+#define IRSND_SUPPORT_PENTAX_PROTOCOL           0       // Pentax               >= 10000                 ~150 bytes\r
+#define IRSND_SUPPORT_S100_PROTOCOL             0       // S100                 >= 10000                 ~150 bytes\r
+\r
+\r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * AVR XMega section:\r
+ *\r
+ * Change hardware pin here:                    IRSND_XMEGA_OC0A = OC0A on ATxmegas  supporting OC0A, e.g. ATxmega128A1U\r
+ *                                              IRSND_XMEGA_OC0B = OC0B on ATxmegas  supporting OC0B, e.g. ATxmega128A1U\r
+ *                                              IRSND_XMEGA_OC0C = OC0C on ATxmegas  supporting OC0C, e.g. ATxmega128A1U\r
+ *                                              IRSND_XMEGA_OC0D = OC0D on ATxmegas  supporting OC0D, e.g. ATxmega128A1U\r
+ *                                              IRSND_XMEGA_OC1A = OC1A on ATxmegas  supporting OC1A, e.g. ATxmega128A1U\r
+ *                                              IRSND_XMEGA_OC1B = OC1B on ATxmegas  supporting OC1B, e.g. ATxmega128A1U\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#if defined(__AVR_XMEGA__)                                              // XMEGA\r
+#  define IRSND_PORT_PRE                        PORTD                   \r
+#  define XMEGA_Timer                           TCD0\r
+#  define IRSND_OCx                             IRSND_XMEGA_OC0B        // use OC0B\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
- * AVR section:\r
+ * AVR ATMega/ATTiny section:\r
  *\r
  * Change hardware pin here:                    IRSND_OC2  = OC2  on ATmegas         supporting OC2,  e.g. ATmega8\r
  *                                              IRSND_OC2A = OC2A on ATmegas         supporting OC2A, e.g. ATmega88\r
@@ -94,7 +112,7 @@
  *                                              IRSND_OC0B = OC0B on ATmegas/ATtinys supporting OC0B, e.g. ATtiny84, ATtiny85\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
-#if defined(ATMEL_AVR)\r
+#elif defined(ATMEL_AVR)\r
 #  define IRSND_OCx                             IRSND_OC2B              // use OC2B\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
@@ -105,18 +123,18 @@
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 #elif defined(PIC_C18)                                                  // C18 or XC8 compiler\r
-# if defined(__12F1840)                                                 // XC8 compiler\r
-#  define Pre_Scaler                            1                       // define prescaler for timer2 e.g. 1,4,16\r
-#  define F_CPU                                 32000000UL              // PIC frequency: set your freq here\r
-#  define PIC_Scaler                            2                       // PIC needs /2 extra in IRSND_FREQ_32_KHZ calculation for right value\r
+#  if defined(__12F1840)                                                // XC8 compiler\r
+#    define Pre_Scaler                          1                       // define prescaler for timer2 e.g. 1,4,16\r
+#    define F_CPU                               32000000UL              // PIC frequency: set your freq here\r
+#    define PIC_Scaler                          2                       // PIC needs /2 extra in IRSND_FREQ_32_KHZ calculation for right value\r
 \r
-# else                                                                  // C18 compiler\r
-#  define IRSND_OCx                             IRSND_PIC_CCP2          // Use PWMx for PIC\r
+#  else                                                                 // C18 compiler\r
+#    define IRSND_OCx                           IRSND_PIC_CCP2          // Use PWMx for PIC\r
                                                                         // change other PIC C18 specific settings:\r
-#  define F_CPU                                 48000000UL              // PIC frequency: set your freq here\r
-#  define Pre_Scaler                            4                       // define prescaler for timer2 e.g. 1,4,16\r
-#  define PIC_Scaler                            2                       // PIC needs /2 extra in IRSND_FREQ_32_KHZ calculation for right value\r
-# endif\r
+#    define F_CPU                               48000000UL              // PIC frequency: set your freq here\r
+#    define Pre_Scaler                          4                       // define prescaler for timer2 e.g. 1,4,16\r
+#    define PIC_Scaler                          2                       // PIC needs /2 extra in IRSND_FREQ_32_KHZ calculation for right value\r
+#  endif\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * ARM STM32 section:\r
@@ -129,7 +147,7 @@
 #  define IRSND_TIMER_CHANNEL_NUMBER            1                       // only channel 1 can be used at the moment, others won't work\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
- * Other target system\r
+ * Other target systems\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 #elif !defined (UNIX_OR_WINDOWS)\r