Version 2.0.4

[irmp.git] / irsndconfig.h

diff --git a/irsndconfig.h b/irsndconfig.h
index b669221f25aab2c41e05bc5bb2df1b49d2523a0a..7af7e8e31e0c9b89b1cb5b1a667ea7aa8c1b6dfd 100644 (file)
--- a/irsndconfig.h
+++ b/irsndconfig.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2010-2011 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irsndconfig.h,v 1.27 2011/09/20 10:45:28 fm Exp $\r
+ * $Id: irsndconfig.h,v 1.31 2012/02/24 15:00:18 fm Exp $\r
  *\r
  * ATMEGA88 @ 8 MHz\r
  *\r
@@ -45,8 +45,8 @@
 #define IRSND_SUPPORT_JVC_PROTOCOL              0       // JVC                  >= 10000                 ~150 bytes\r
 #define IRSND_SUPPORT_NEC16_PROTOCOL            0       // NEC16                >= 10000                 ~150 bytes\r
 #define IRSND_SUPPORT_NEC42_PROTOCOL            0       // NEC42                >= 10000                 ~150 bytes\r
-#define IRSND_SUPPORT_IR60_PROTOCOL             0       // IR60 (SAB2008)       >= 10000                 DON'T CHANGE, NOT SUPPORTED YET!\r
-#define IRSND_SUPPORT_GRUNDIG_PROTOCOL          0       // Grundig              >= 10000                 ~300 bytes\r
+#define IRSND_SUPPORT_IR60_PROTOCOL             1       // IR60 (SDA2008)       >= 10000                 ~250 bytes\r
+#define IRSND_SUPPORT_GRUNDIG_PROTOCOL          1       // Grundig              >= 10000                 ~300 bytes\r
 #define IRSND_SUPPORT_SIEMENS_PROTOCOL          0       // Siemens, Gigaset     >= 15000                 ~150 bytes\r
 #define IRSND_SUPPORT_NOKIA_PROTOCOL            0       // Nokia                >= 10000                 ~400 bytes\r
 \r
@@ -80,7 +80,7 @@
 #define IRSND_PIC_CCP1                          1       // PIC C18 RC2 = PWM1 module\r
 #define IRSND_PIC_CCP2                          2       // PIC C18 RC1 = PWM2 module\r
 \r
-#ifndef PIC_C18                                                                // AVR part\r
+#ifndef PIC_C18                                                                 // AVR part\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * AVR\r
@@ -91,8 +91,8 @@
  *                                              IRSND_OC0  = OC0  on ATmegas         supporting OC0,  e.g. ATmega162\r
  *                                              IRSND_OC0A = OC0A on ATmegas/ATtinys supporting OC0A, e.g. ATtiny84, ATtiny85\r
  *                                              IRSND_OC0B = OC0B on ATmegas/ATtinys supporting OC0B, e.g. ATtiny84, ATtiny85\r
- *                                                                                             IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
- *                                                                                             IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 \r
@@ -102,12 +102,12 @@
  * PIC C18\r
  *\r
  * Change hardware pin here:                    IRSND_PIC_CCP1 = RC2 on PIC 18F2550/18F4550, ...\r
- *                                                                                             IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
+ *                                                                                              IRSND_PIC_CCP2 = RC1 on PIC 18F2550/18F4550, ...\r
  *---------------------------------------------------------------------------------------------------------------------------------------------------\r
  */\r
 \r
 #else\r
-#define IRSND_OCx                                  IRSND_PIC_CCP2      // Use PWMx for PIC\r
+#define IRSND_OCx                                   IRSND_PIC_CCP2      // Use PWMx for PIC\r
 \r
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * PIC C18 - change other PIC specific settings - ignore it when using AVR\r
@@ -125,9 +125,9 @@
 #if IRSND_OCx == IRSND_PIC_CCP2        \r
 #define IRSND_PIN                               TRISCbits.TRISC1    // RC1 = PWM2\r
 \r
-#define SetDCPWM(x)                            SetDCPWM2(x)                    \r
-#define ClosePWM                                       ClosePWM2\r
-#define OpenPWM(x)                                     OpenPWM2(x) \r
+#define SetDCPWM(x)                             SetDCPWM2(x)                    \r
+#define ClosePWM                                        ClosePWM2\r
+#define OpenPWM(x)                                      OpenPWM2(x) \r
 #endif\r
 \r
 #if IRSND_OCx == IRSND_PIC_CCP1        \r